Skip to content

Commit

Permalink
8293819: sun/util/logging/PlatformLoggerTest.java failed with "Runtim…
Browse files Browse the repository at this point in the history
…eException: Retrieved backing PlatformLogger level null is not the expected CONFIG"

Backport-of: 11e7d53b23796cbd3d878048f7553885ae07f4d1
  • Loading branch information
GoeLin committed Feb 10, 2023
1 parent d52e18c commit 49023f4
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions test/jdk/sun/util/logging/PlatformLoggerTest.java
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -34,6 +34,7 @@
* @run main/othervm PlatformLoggerTest
*/

import java.lang.ref.Reference;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.logging.*;
Expand Down Expand Up @@ -122,7 +123,7 @@ private static void checkLevel(PlatformLogger logger, PlatformLogger.Level level
}

private static void checkLogger(String name, Level level) {
Logger logger = LogManager.getLogManager().getLogger(name);
final Logger logger = LogManager.getLogManager().getLogger(name);
if (logger == null) {
throw new RuntimeException("Logger " + name +
" does not exist");
Expand All @@ -132,6 +133,7 @@ private static void checkLogger(String name, Level level) {
throw new RuntimeException("Invalid level for logger " +
logger.getName() + " " + logger.getLevel());
}
Reference.reachabilityFence(logger);
}

private static void testLogMethods(PlatformLogger logger) {
Expand Down Expand Up @@ -170,10 +172,11 @@ private static void checkPlatformLoggerLevels(PlatformLogger... loggers) {
}
}

Logger javaLogger = Logger.getLogger("foo.bar.baz");
final Logger javaLogger = Logger.getLogger("foo.bar.baz");
for (Level level : levels) {
checkJavaLoggerLevel(javaLogger, level);
}
Reference.reachabilityFence(javaLogger);
}

private static void checkLoggerLevel(PlatformLogger logger, Level level) {
Expand All @@ -185,12 +188,13 @@ private static void checkLoggerLevel(PlatformLogger logger, Level level) {
}

// check the level set in java.util.logging.Logger
Logger javaLogger = LogManager.getLogManager().getLogger(logger.getName());
final Logger javaLogger = LogManager.getLogManager().getLogger(logger.getName());
Level javaLevel = javaLogger.getLevel();
if (javaLogger.getLevel() != level) {
throw new RuntimeException("Retrieved backing java.util.logging.Logger level "
+ javaLevel + " is not the expected " + level);
}
Reference.reachabilityFence(javaLogger);
}

private static void checkJavaLoggerLevel(Logger logger, Level level) {
Expand All @@ -200,7 +204,7 @@ private static void checkJavaLoggerLevel(Logger logger, Level level) {
System.out.println("Testing Java Level with: " + level.getName());

// create a brand new java logger
Logger javaLogger = sun.util.logging.internal.LoggingProviderImpl.getLogManagerAccess()
final Logger javaLogger = sun.util.logging.internal.LoggingProviderImpl.getLogManagerAccess()
.demandLoggerFor(LogManager.getLogManager(),
logger.getName()+"."+level.getName(), Thread.class.getModule());

Expand Down Expand Up @@ -237,6 +241,7 @@ private static void checkJavaLoggerLevel(Logger logger, Level level) {
+ plogger.level() + " is not the expected " + expected);

}
Reference.reachabilityFence(javaLogger);
}

private static void checkPlatformLoggerLevelMapping(Level level) {
Expand Down

1 comment on commit 49023f4

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.