Skip to content

Commit 837e7c2

Browse files
authored
Merge pull request #18473 from pshipton/logger43
(0.43) jdk11 - Don't cache instances of TemporaryLoggerFinder
2 parents df46709 + 055f110 commit 837e7c2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

jcl/src/java.base/share/classes/java/lang/System.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1802,13 +1802,13 @@ public static LoggerFinder getLoggerFinder() {
18021802
(PrivilegedAction<LoggerFinder>) () -> jdk.internal.logger.LoggerFinderLoader.getLoggerFinder(),
18031803
AccessController.getContext(),
18041804
com.ibm.oti.util.RuntimePermissions.permissionLoggerFinder);
1805-
/*[IF JAVA_SPEC_VERSION >= 17]*/
1805+
/*[IF JAVA_SPEC_VERSION >= 11]*/
18061806
/*[IF JAVA_SPEC_VERSION != 21] Temporary until jdk21 picks up the OpenJDK change */
18071807
if (localFinder instanceof jdk.internal.logger.LoggerFinderLoader.TemporaryLoggerFinder) {
18081808
return localFinder;
18091809
}
18101810
/*[ENDIF] JAVA_SPEC_VERSION != 21 */
1811-
/*[ENDIF] JAVA_SPEC_VERSION >= 17 */
1811+
/*[ENDIF] JAVA_SPEC_VERSION >= 11 */
18121812
loggerFinder = localFinder;
18131813
}
18141814
return localFinder;

0 commit comments

Comments
 (0)