From 897607e279ebe76caaff256e1aca87e92e34dc37 Mon Sep 17 00:00:00 2001 From: Peter Shipton Date: Thu, 18 Jan 2024 07:05:29 -0500 Subject: [PATCH] Don't cache instances of TemporaryLoggerFinder for jdk21 The OpenJDK change was added in 21.0.2 Related to https://github.com/eclipse-openj9/openj9/pull/18406 https://github.com/ibmruntimes/openj9-openjdk-jdk21/commit/dd964e7a71b Signed-off-by: Peter Shipton --- jcl/src/java.base/share/classes/java/lang/System.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/jcl/src/java.base/share/classes/java/lang/System.java b/jcl/src/java.base/share/classes/java/lang/System.java index 900c44959ef..1e6e6985ee1 100644 --- a/jcl/src/java.base/share/classes/java/lang/System.java +++ b/jcl/src/java.base/share/classes/java/lang/System.java @@ -1803,11 +1803,9 @@ public static LoggerFinder getLoggerFinder() { AccessController.getContext(), com.ibm.oti.util.RuntimePermissions.permissionLoggerFinder); /*[IF JAVA_SPEC_VERSION >= 11]*/ - /*[IF JAVA_SPEC_VERSION != 21] Temporary until jdk21 picks up the OpenJDK change */ if (localFinder instanceof jdk.internal.logger.LoggerFinderLoader.TemporaryLoggerFinder) { return localFinder; } - /*[ENDIF] JAVA_SPEC_VERSION != 21 */ /*[ENDIF] JAVA_SPEC_VERSION >= 11 */ loggerFinder = localFinder; }