svn commit: r1308001 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStream.java

[db...@apache.org]

Author: dblevins
Date: Sun Apr  1 02:40:19 2012
New Revision: 1308001

URL: http://svn.apache.org/viewvc?rev=1308001&view=rev
Log:
Tweaks to OPENEJB-1761
Code to scan for 'logging.level.foo' properties didn't actually work

Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStream.java

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStream.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStream.java?rev=1308001&r1=1308000&r2=1308001&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStream.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStream.java Sun Apr  1 02:40:19 2012
@@ -18,6 +18,7 @@ package org.apache.openejb.util;
 
 import org.apache.openejb.loader.SystemInstance;
 
+import java.util.Properties;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
@@ -30,11 +31,13 @@ public class JuliLogStream implements Lo
         logger = Logger.getLogger(logCategory.getName());
 
         // if level set through properties force it
-        if (SystemInstance.get().getProperties().containsKey(logger.getName() + ".level")
-                || SystemInstance.get().getProperties().containsKey("logging.level." + logger.getName())) {
-            for (Handler handler : logger.getHandlers()) {
-                handler.setLevel(logger.getLevel());
-            }
+        final Properties p = SystemInstance.get().getProperties();
+        final String levelName = p.getProperty("logging.level." + logger.getName());
+        if (levelName == null) return;
+
+        final Level level = Level.parse(levelName);
+        for (Handler handler : logger.getHandlers()) {
+            handler.setLevel(level);
         }
     }