svn commit: r1652637 - in /uima/uimaj/trunk/uimaj-core/src: main/java/org/apache/uima/util/impl/JSR47Logger_impl.java test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java

[sc...@apache.org]

Author: schor
Date: Sat Jan 17 16:46:06 2015
New Revision: 1652637

URL: http://svn.apache.org/r1652637
Log:
[UIMA-4183] initialize logger levels to null in test case.  Fix the set level code to allow null.

Modified:
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java
    uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java?rev=1652637&r1=1652636&r2=1652637&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java Sat Jan 17 16:46:06 2015
@@ -455,6 +455,9 @@ public class JSR47Logger_impl implements
    * @return Level - corresponding JSR47 level
    */
   private java.util.logging.Level getJSR47Level(Level level) {
+    if (null == level) {
+      return null;
+    }
     switch (level.toInteger()) {
       case org.apache.uima.util.Level.OFF_INT:
         return java.util.logging.Level.OFF;

Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java?rev=1652637&r1=1652636&r2=1652637&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java Sat Jan 17 16:46:06 2015
@@ -20,6 +20,7 @@
 package org.apache.uima.util.impl;
 
 import java.util.HashMap;
+import java.util.logging.LogManager;
 import java.util.logging.Logger;
 
 import junit.framework.Assert;
@@ -51,11 +52,14 @@ public class JSR47Logger_implTest extend
   }
 
   public void testLogWrapperCreation() throws Exception {
+    
     // Set the root logger's level to INFO ... may not be the default
     java.util.logging.Logger.getLogger("").setLevel(java.util.logging.Level.INFO);
 
     org.apache.uima.util.Logger uimaLogger = JSR47Logger_impl.getInstance();
     org.apache.uima.util.Logger classLogger = JSR47Logger_impl.getInstance(this.getClass());
+    uimaLogger.setLevel(null);  // causes it to inherit from above
+    classLogger.setLevel(null);  // causes it to inherit from above
 
     // check base configuration
     Assert.assertNotNull(uimaLogger);
@@ -68,6 +72,8 @@ public class JSR47Logger_implTest extend
     // create logger
     org.apache.uima.util.Logger uimaLogger = JSR47Logger_impl.getInstance();
     org.apache.uima.util.Logger classLogger = JSR47Logger_impl.getInstance(this.getClass());
+    uimaLogger.setLevel(null);  // causes it to inherit from above
+    classLogger.setLevel(null);  // causes it to inherit from above
 
     //get uimaLogger log level, get parent logger of "org.apache.uima" until we have the
     //JSR47 root logger that defines the default log level