harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r449065 - /incubator/harmony/enhanced/classlib/trunk/modules/logging/src/main/java/java/util/logging/LogManager.java
Date Fri, 22 Sep 2006 19:46:43 GMT
Author: geirm
Date: Fri Sep 22 12:46:43 2006
New Revision: 449065

URL: http://svn.apache.org/viewvc?view=rev&rev=449065
Log:
Patch from Nikolay to catch the strange chance that
"gobal" isn't initialized.


Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/logging/src/main/java/java/util/logging/LogManager.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/main/java/java/util/logging/LogManager.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/main/java/java/util/logging/LogManager.java?view=diff&rev=449065&r1=449064&r2=449065
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/main/java/java/util/logging/LogManager.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/main/java/java/util/logging/LogManager.java
Fri Sep 22 12:46:43 2006
@@ -181,6 +181,7 @@
 		AccessController.doPrivileged(new PrivilegedAction<Object>() {
 			public Object run() {
 				String className = System.getProperty("java.util.logging.manager"); //$NON-NLS-1$
+                
 				if (null != className) {
 					manager = (LogManager) getInstanceByClass(className);
 				}
@@ -197,8 +198,11 @@
 
 				// if global logger has been initialized, set root as its parent
                 Logger root = Logger.getLogger(""); //$NON-NLS-1$
-                Logger.global.setParent(root);
-				return null;
+                
+                Logger global = (Logger.global == null ? Logger.getLogger("global") : Logger.global);
+                global.setParent(root);
+
+                return null;
 			}
 		});
 	}



Mime
View raw message