--- a/jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java Fri Mar 24 09:16:58 2017 -0700
+++ b/jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java Fri Mar 24 16:35:51 2017 +0000
@@ -85,7 +85,6 @@
import java.util.stream.Stream;
import jdk.internal.misc.VM;
-import jdk.internal.module.IllegalAccessLogger;
import jdk.internal.module.Modules;
@@ -429,20 +428,14 @@
abort(null, "java.launcher.jar.error3", jarname);
}
- // Add-Exports and Add-Opens to allow illegal access
+ // Add-Exports and Add-Opens
String exports = mainAttrs.getValue(ADD_EXPORTS);
if (exports != null) {
- String warn = getLocalizedMessage("java.launcher.permitaccess.warning",
- jarname, ADD_EXPORTS);
- System.err.println(warn);
- addExportsOrOpens(exports, false, ADD_EXPORTS);
+ addExportsOrOpens(exports, false);
}
String opens = mainAttrs.getValue(ADD_OPENS);
if (opens != null) {
- String warn = getLocalizedMessage("java.launcher.permitaccess.warning",
- jarname, ADD_OPENS);
- System.err.println(warn);
- addExportsOrOpens(opens, true, ADD_OPENS);
+ addExportsOrOpens(opens, true);
}
/*
@@ -467,15 +460,7 @@
* Process the Add-Exports or Add-Opens value. The value is
* {@code <module>/<package> ( <module>/<package>)*}.
*/
- static void addExportsOrOpens(String value, boolean open, String how) {
- IllegalAccessLogger.Builder builder;
- IllegalAccessLogger logger = IllegalAccessLogger.illegalAccessLogger();
- if (logger == null) {
- builder = new IllegalAccessLogger.Builder();
- } else {
- builder = logger.toBuilder();
- }
-
+ static void addExportsOrOpens(String value, boolean open) {
for (String moduleAndPackage : value.split(" ")) {
String[] s = moduleAndPackage.trim().split("/");
if (s.length == 2) {
@@ -485,18 +470,14 @@
Layer.boot().findModule(mn).ifPresent(m -> {
if (m.getDescriptor().packages().contains(pn)) {
if (open) {
- builder.logAccessToOpenPackage(m, pn, how);
Modules.addOpensToAllUnnamed(m, pn);
} else {
- builder.logAccessToExportedPackage(m, pn, how);
Modules.addExportsToAllUnnamed(m, pn);
}
}
});
}
}
-
- IllegalAccessLogger.setIllegalAccessLogger(builder.build());
}
// From src/share/bin/java.c: