提交 319806c3 编写于 作者: R redestad

8175079: Lazy initialization of ImageReader breaks rmid

Reviewed-by: alanb
上级 f1d92b1a
...@@ -1945,9 +1945,6 @@ public final class System { ...@@ -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 {
......
...@@ -115,12 +115,7 @@ public final class ModuleBootstrap { ...@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册