From 4f6a591e91058640393b4c00b022246b843169c3 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Thu, 5 Dec 2013 01:39:48 +0900 Subject: [PATCH] Do not log the deprecated system property when it's not specified by a user --- .../io/netty/util/ResourceLeakDetector.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/common/src/main/java/io/netty/util/ResourceLeakDetector.java b/common/src/main/java/io/netty/util/ResourceLeakDetector.java index 68ce3a7eab..030fec548f 100644 --- a/common/src/main/java/io/netty/util/ResourceLeakDetector.java +++ b/common/src/main/java/io/netty/util/ResourceLeakDetector.java @@ -66,11 +66,16 @@ public final class ResourceLeakDetector { private static final InternalLogger logger = InternalLoggerFactory.getInstance(ResourceLeakDetector.class); static { - final boolean disabled = SystemPropertyUtil.getBoolean("io.netty.noResourceLeakDetection", false); - logger.debug("-Dio.netty.noResourceLeakDetection: {}", disabled); - logger.warn( - "-Dio.netty.noResourceLeakDetection is deprecated. Use '-D{}={}' instead.", - PROP_LEVEL, DEFAULT_LEVEL.name().toLowerCase()); + final boolean disabled; + if (SystemPropertyUtil.get("io.netty.noResourceLeakDetection") != null) { + disabled = SystemPropertyUtil.getBoolean("io.netty.noResourceLeakDetection", false); + logger.debug("-Dio.netty.noResourceLeakDetection: {}", disabled); + logger.warn( + "-Dio.netty.noResourceLeakDetection is deprecated. Use '-D{}={}' instead.", + PROP_LEVEL, DEFAULT_LEVEL.name().toLowerCase()); + } else { + disabled = false; + } Level defaultLevel = disabled? Level.DISABLED : DEFAULT_LEVEL; String levelStr = SystemPropertyUtil.get(PROP_LEVEL, defaultLevel.name()).trim().toUpperCase(); @@ -90,7 +95,7 @@ public final class ResourceLeakDetector { private static final int DEFAULT_SAMPLING_INTERVAL = 113; /** - * @deprecated Use {@link #setLevel(ResourceLeakDetector.Level)} instead. + * @deprecated Use {@link #setLevel(Level)} instead. */ @Deprecated public static void setEnabled(boolean enabled) {