Skip to content

Commit

Permalink
Merge pull request #18769 from pshipton/templogger0.43
Browse files Browse the repository at this point in the history
(0.43) Don't cache instances of TemporaryLoggerFinder for jdk21
  • Loading branch information
keithc-ca committed Jan 18, 2024
2 parents eacfbcf + 897607e commit c9dd1f5
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions jcl/src/java.base/share/classes/java/lang/System.java
Expand Up @@ -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;
}
Expand Down

0 comments on commit c9dd1f5

Please sign in to comment.