OpenJDK / jdk / jdk
changeset 59298:bf77476840f1
8244961: MethodHandles::privateLookupIn throws NPE when called during initPhase2
Reviewed-by: chegar
| author | mchung |
|---|---|
| date | Thu, 14 May 2020 17:05:41 -0700 |
| parents | 85dc8f4c7f3c |
| children | 748fedeb7cc1 |
| files | src/java.base/share/classes/java/lang/invoke/MethodHandles.java |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java Thu May 14 15:17:45 2020 -0700 +++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java Thu May 14 17:05:41 2020 -0700 @@ -256,12 +256,12 @@ // 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);