8244961: MethodHandles::privateLookupIn throws NPE when called during…

… initPhase2 Reviewed-by: chegar
openjdk · May 15, 2020 · b883bad · b883bad
1 parent cab61f1
commit b883bad
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -256,12 +256,12 @@ public static Lookup privateLookupIn(Class<?> targetClass, Lookup caller) throws
             // M2 != M1, set previous lookup class to M1 and drop MODULE access
             newPreviousClass = callerClass;
             newModes &= ~Lookup.MODULE;
-        }
 
-        if (!callerModule.isNamed() && targetModule.isNamed()) {
-            IllegalAccessLogger logger = IllegalAccessLogger.illegalAccessLogger();
-            if (logger != null) {
-                logger.logIfOpenedForIllegalAccess(caller, targetClass);
+            if (!callerModule.isNamed() && targetModule.isNamed()) {
+                IllegalAccessLogger logger = IllegalAccessLogger.illegalAccessLogger();
+                if (logger != null) {
+                    logger.logIfOpenedForIllegalAccess(caller, targetClass);
+                }
             }
         }
         return Lookup.newLookup(targetClass, newPreviousClass, newModes);