Use a better named static method instead of a constant.

openjdk · Dec 20, 2020 · db002e6 · db002e6
1 parent f50b852
commit db002e6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/...org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/NashornLoader.java b/...org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/NashornLoader.java
@@ -58,7 +58,6 @@ abstract class NashornLoader extends SecureClassLoader {
     protected static final String SCRIPTS_PKG_INTERNAL        = "org/openjdk/nashorn/internal/scripts";
 
     static final Module NASHORN_MODULE = Context.class.getModule();
-    static final boolean modular = NASHORN_MODULE.getName() != null;
 
     private static final Permission[] SCRIPT_PERMISSIONS;
 
@@ -121,6 +120,10 @@ final void addModuleExport(final Module to) {
         }
     }
 
+    static boolean isInNamedModule() {
+        return NASHORN_MODULE.getName() != null;
+    }
+
     protected static void checkPackageAccess(final String name) {
         final int i = name.lastIndexOf('.');
         if (i != -1) {

diff --git a/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ScriptLoader.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ScriptLoader.java
@@ -53,7 +53,7 @@ final class ScriptLoader extends NashornLoader {
         super(context.getStructLoader());
         this.context = context;
 
-        if (modular) {
+        if (isInNamedModule()) {
             // new scripts module, it's specific exports and read-edges
             scriptModule = createModule();
 
@@ -99,7 +99,7 @@ private Module createModule() {
     protected Class<?> loadClass(final String name, final boolean resolve) throws ClassNotFoundException {
         checkPackageAccess(name);
         final Class<?> cl = super.loadClass(name, resolve);
-        if (!structureAccessAdded && modular) {
+        if (!structureAccessAdded && isInNamedModule()) {
             final StructureLoader structLoader = context.getStructLoader();
             if (cl.getClassLoader() == structLoader) {
                 structureAccessAdded = true;

diff --git a/...g.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/StructureLoader.java b/...g.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/StructureLoader.java
@@ -51,7 +51,7 @@ final class StructureLoader extends NashornLoader {
     StructureLoader(final ClassLoader parent) {
         super(parent);
 
-        if (modular) {
+        if (isInNamedModule()) {
             // new structures module, it's exports, read edges
             structuresModule = createModule();