< prev index next >
src/java.base/share/classes/jdk/internal/logger/SimpleConsoleLogger.java
Print this page
rev 14210 : 8154231: Simplify access to System properties from JDK code
Reviewed-by: rriggs
*** 53,64 ****
static final Level DEFAULT_LEVEL = getDefaultLevel();
static final PlatformLogger.Level DEFAULT_PLATFORM_LEVEL =
PlatformLogger.toPlatformLevel(DEFAULT_LEVEL);
static Level getDefaultLevel() {
! String levelName = AccessController.doPrivileged(
! new GetPropertyAction("jdk.system.logger.level", "INFO"));
try {
return Level.valueOf(levelName);
} catch (IllegalArgumentException iae) {
return Level.INFO;
}
--- 53,64 ----
static final Level DEFAULT_LEVEL = getDefaultLevel();
static final PlatformLogger.Level DEFAULT_PLATFORM_LEVEL =
PlatformLogger.toPlatformLevel(DEFAULT_LEVEL);
static Level getDefaultLevel() {
! String levelName = GetPropertyAction
! .getProperty("jdk.system.logger.level", "INFO");
try {
return Level.valueOf(levelName);
} catch (IllegalArgumentException iae) {
return Level.INFO;
}
*** 423,434 ****
getSimpleFormat(DEFAULT_FORMAT_PROP_KEY, null);
// Make it easier to wrap Logger...
static private final String[] skips;
static {
! String additionalPkgs = AccessController.doPrivileged(
! new GetPropertyAction("jdk.logger.packages"));
skips = additionalPkgs == null ? new String[0] : additionalPkgs.split(",");
}
static boolean isFilteredFrame(StackFrame st) {
// skip logging/logger infrastructure
--- 423,434 ----
getSimpleFormat(DEFAULT_FORMAT_PROP_KEY, null);
// Make it easier to wrap Logger...
static private final String[] skips;
static {
! String additionalPkgs =
! GetPropertyAction.getProperty("jdk.logger.packages");
skips = additionalPkgs == null ? new String[0] : additionalPkgs.split(",");
}
static boolean isFilteredFrame(StackFrame st) {
// skip logging/logger infrastructure
*** 483,493 ****
// Do not use any lambda in this method. Using a lambda here causes
// jdk/test/java/lang/invoke/lambda/LogGeneratedClassesTest.java
// to fail - because that test has a testcase which somehow references
// PlatformLogger and counts the number of generated lambda classes.
! String format = AccessController.doPrivileged(new GetPropertyAction(key));
if (format == null && defaultPropertyGetter != null) {
format = defaultPropertyGetter.apply(key);
}
if (format != null) {
--- 483,493 ----
// Do not use any lambda in this method. Using a lambda here causes
// jdk/test/java/lang/invoke/lambda/LogGeneratedClassesTest.java
// to fail - because that test has a testcase which somehow references
// PlatformLogger and counts the number of generated lambda classes.
! String format = GetPropertyAction.getProperty(key);
if (format == null && defaultPropertyGetter != null) {
format = defaultPropertyGetter.apply(key);
}
if (format != null) {
< prev index next >