hg: jdk9/dev/jdk: 8157068: ExceptionInInitializerError if images build patched to use exploded version of jdk.internal.module.SystemModules

[mandy.chung at oracle.com]

Changeset: e53f8c34880e
Author:    mchung
Date:      2016-05-19 11:17 -0700
URL:       http://hg.openjdk.java.net/jdk9/dev/jdk/rev/e53f8c34880e

8157068: ExceptionInInitializerError if images build patched to use exploded version of jdk.internal.module.SystemModules
Reviewed-by: alanb

! src/java.base/share/classes/java/lang/module/SystemModuleFinder.java
! src/java.base/share/classes/jdk/internal/jimage/ImageReader.java
! src/java.base/share/classes/jdk/internal/module/SystemModules.java
- test/tools/launcher/modules/patch/PatchTest.java
+ test/tools/launcher/modules/patch/basic/PatchTest.java
+ test/tools/launcher/modules/patch/basic/src/test/jdk/test/Main.java
+ test/tools/launcher/modules/patch/basic/src/test/module-info.java
+ test/tools/launcher/modules/patch/basic/src1/java.base/java/text/Annotation.java
+ test/tools/launcher/modules/patch/basic/src1/java.base/java/text/AnnotationBuddy.java
+ test/tools/launcher/modules/patch/basic/src1/jdk.compiler/com/sun/tools/javac/Main.java
+ test/tools/launcher/modules/patch/basic/src1/jdk.compiler/com/sun/tools/javac/MainBuddy.java
+ test/tools/launcher/modules/patch/basic/src1/jdk.naming.dns/com/sun/jndi/dns/DnsClient.java
+ test/tools/launcher/modules/patch/basic/src1/jdk.naming.dns/com/sun/jndi/dns/DnsClientBuddy.java
+ test/tools/launcher/modules/patch/basic/src2/java.base/java/lang2/Object.java
+ test/tools/launcher/modules/patch/basic/src2/jdk.compiler/com/sun/tools/javac2/Main.java
+ test/tools/launcher/modules/patch/basic/src2/jdk.naming.dns/com/sun/jndi/dns2/Zone.java
- test/tools/launcher/modules/patch/src/test/jdk/test/Main.java
- test/tools/launcher/modules/patch/src/test/module-info.java
- test/tools/launcher/modules/patch/src1/java.base/java/text/Annotation.java
- test/tools/launcher/modules/patch/src1/java.base/java/text/AnnotationBuddy.java
- test/tools/launcher/modules/patch/src1/jdk.compiler/com/sun/tools/javac/Main.java
- test/tools/launcher/modules/patch/src1/jdk.compiler/com/sun/tools/javac/MainBuddy.java
- test/tools/launcher/modules/patch/src1/jdk.naming.dns/com/sun/jndi/dns/DnsClient.java
- test/tools/launcher/modules/patch/src1/jdk.naming.dns/com/sun/jndi/dns/DnsClientBuddy.java
- test/tools/launcher/modules/patch/src2/java.base/java/lang2/Object.java
- test/tools/launcher/modules/patch/src2/jdk.compiler/com/sun/tools/javac2/Main.java
- test/tools/launcher/modules/patch/src2/jdk.naming.dns/com/sun/jndi/dns2/Zone.java
+ test/tools/launcher/modules/patch/systemmodules/PatchSystemModules.java
+ test/tools/launcher/modules/patch/systemmodules/src/m1/module-info.java
+ test/tools/launcher/modules/patch/systemmodules/src/m1/p1/Main.java
+ test/tools/launcher/modules/patch/systemmodules/src/m2/module-info.java
+ test/tools/launcher/modules/patch/systemmodules/src/m2/p2/Lib.java
+ test/tools/launcher/modules/patch/systemmodules/src1/java.base/jdk/internal/modules/SystemModules.java
+ test/tools/launcher/modules/patch/systemmodules/src1/m2/p2/Lib.java