Skip to content

Commit

Permalink
Don't cache instances of TemporaryLoggerFinder for jdk21
Browse files Browse the repository at this point in the history
The OpenJDK change was added in 21.0.2

Related to
eclipse-openj9#18406
ibmruntimes/openj9-openjdk-jdk21@dd964e7a71b

Signed-off-by: Peter Shipton <[email protected]>
  • Loading branch information
pshipton committed Jan 18, 2024
1 parent 949dad8 commit 8c22910
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
Original file line number Diff line number Diff line change
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 8c22910

Please sign in to comment.