Merge pull request #18462 from pshipton/logger11

jdk11 - Don't cache instances of TemporaryLoggerFinder
eclipse-openj9 · Nov 16, 2023 · 5899f3c · 5899f3c
2 parents e95661e + f924dc8
commit 5899f3c
Showing 1 changed file with 2 additions and 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
@@ -1802,13 +1802,13 @@ public static LoggerFinder getLoggerFinder() {
 								(PrivilegedAction<LoggerFinder>) () -> jdk.internal.logger.LoggerFinderLoader.getLoggerFinder(),
 								AccessController.getContext(),
 								com.ibm.oti.util.RuntimePermissions.permissionLoggerFinder);
-			/*[IF JAVA_SPEC_VERSION >= 17]*/
+			/*[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 >= 17 */
+			/*[ENDIF] JAVA_SPEC_VERSION >= 11 */
 			loggerFinder = localFinder;
 		}
 		return localFinder;