Merge pull request #18406 from pshipton/loggerfinder

Don't cache instances of TemporaryLoggerFinder
eclipse-openj9 · Nov 6, 2023 · 4acf608 · 4acf608
2 parents 60b2e21 + 1c58723
commit 4acf608
Showing 1 changed file with 12 additions and 3 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
@@ -1793,13 +1793,22 @@ public Logger getLocalizedLogger(String loggerName, ResourceBundle bundle, Modul
 	 */
 	public static LoggerFinder getLoggerFinder() {
 		verifyPermissions();
-		if (loggerFinder == null) {
-			loggerFinder = AccessController.doPrivileged(
+		LoggerFinder localFinder = loggerFinder;
+		if (localFinder == null) {
+			localFinder = AccessController.doPrivileged(
 								(PrivilegedAction<LoggerFinder>) () -> jdk.internal.logger.LoggerFinderLoader.getLoggerFinder(),
 								AccessController.getContext(),
 								com.ibm.oti.util.RuntimePermissions.permissionLoggerFinder);
+			/*[IF JAVA_SPEC_VERSION >= 17]*/
+			/*[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 >= 17 */
+			loggerFinder = localFinder;
 		}
-		return loggerFinder;
+		return localFinder;
 	}
 
 	private static void verifyPermissions() {