changeset 23342:d7a41da68b85

8036916: Deprecation warnings in LogManager Reviewed-by: mchung
author dfuchs
date Wed, 12 Mar 2014 20:18:47 +0100
parents b9e3bcefc522
children bc82981ff581
files jdk/src/share/classes/java/util/logging/LogManager.java
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/src/share/classes/java/util/logging/LogManager.java	Wed Mar 12 21:45:20 2014 +0400
+++ b/jdk/src/share/classes/java/util/logging/LogManager.java	Wed Mar 12 20:18:47 2014 +0100
@@ -570,7 +570,7 @@
         // the context requires default loggers, will be added to the context
         // logger's tree.
         final Logger getGlobalLogger() {
-            @SuppressWarnings("deprecated") // avoids initialization cycles.
+            @SuppressWarnings("deprecation") // avoids initialization cycles.
             final Logger global = Logger.global;
             return global;
         }
@@ -642,7 +642,7 @@
             // method be called for anything else than Logger.global
             // or owner.rootLogger.
             if (!requiresDefaultLoggers() || logger == null
-                    || logger != Logger.global && logger != LogManager.this.rootLogger) {
+                    || logger != getGlobalLogger() && logger != LogManager.this.rootLogger ) {
 
                 // the case where we have a non null logger which is neither
                 // Logger.global nor manager.rootLogger indicates a serious