1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8175079: Lazy initialization of ImageReader breaks rmid

Browse Source 
Reviewed-by: alanb
This commit is contained in:
Claes Redestad 2017-02-16 17:28:50 +01:00
parent a141b69c1b
commit cf871d92f9
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jdk/src/java.base/share/classes/java/lang/System.java
View File

@ -1945,9 +1945,6 @@ public final class System {
// set security manager // set security manager
String cn = System.getProperty("java.security.manager"); String cn = System.getProperty("java.security.manager");
if (cn != null) { if (cn != null) {
// ensure image reader for java.base is initialized before security manager
Object.class.getResource("module-info.class");
if (cn.isEmpty() || "default".equals(cn)) { if (cn.isEmpty() || "default".equals(cn)) {
System.setSecurityManager(new SecurityManager()); System.setSecurityManager(new SecurityManager());
} else { } else {

7
jdk/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
View File

@ -115,12 +115,7 @@ public final class ModuleBootstrap {
long t0 = System.nanoTime(); long t0 = System.nanoTime();
// system modules (may be patched) // system modules (may be patched)
ModuleFinder systemModules; ModuleFinder systemModules = ModuleFinder.ofSystem();
if (SystemModules.MODULE_NAMES.length > 0) {
systemModules = SystemModuleFinder.getInstance();
} else {
systemModules = ModuleFinder.ofSystem();
}
PerfCounters.systemModulesTime.addElapsedTimeFrom(t0); PerfCounters.systemModulesTime.addElapsedTimeFrom(t0);