You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ot...@apache.org on 2008/09/17 20:02:08 UTC

svn commit: r696381 - in /lucene/solr/trunk: CHANGES.txt src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java

Author: otis
Date: Wed Sep 17 11:02:07 2008
New Revision: 696381

URL: http://svn.apache.org/viewvc?rev=696381&view=rev
Log:
SOLR-774 - fixed logging level display

Modified:
    lucene/solr/trunk/CHANGES.txt
    lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java

Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=696381&r1=696380&r2=696381&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Wed Sep 17 11:02:07 2008
@@ -38,6 +38,7 @@
 Bug Fixes
 ----------------------
 
+ 1. SOLR-774: Fixed logging level display (Sean Timm via Otis Gospodnetic)
 
 Build
 ----------------------

Modified: lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java?rev=696381&r1=696380&r2=696381&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java (original)
+++ lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java Wed Sep 17 11:02:07 2008
@@ -227,13 +227,15 @@
     }
     for (Level l : LEVELS) {
       if (l == null) {
+        // avoid NPE
         continue;
       }
       if (logger.isLoggable(l)) {
-        level = l;
+        // return first level loggable
+        return l;
       }
     }
-    return level != null ? level : Level.OFF;
+    return Level.OFF;
   }
 
   private static class LogWrapper