logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgo...@apache.org
Subject svn commit: r1479660 - in /logging/log4j/log4j2/trunk: core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java flume-ng/src/site/xdoc/index.xml
Date Mon, 06 May 2013 17:57:05 GMT
Author: rgoers
Date: Mon May  6 17:57:05 2013
New Revision: 1479660

URL: http://svn.apache.org/r1479660
Log:
Fix findbugs issue and incorrect version reference found by Gary

Modified:
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java
    logging/log4j/log4j2/trunk/flume-ng/src/site/xdoc/index.xml

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java?rev=1479660&r1=1479659&r2=1479660&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java
Mon May  6 17:57:05 2013
@@ -65,8 +65,9 @@ public final class LevelPatternConverter
             final Level level = Level.toLevel(pair[0].trim(), null);
             if (level == null) {
                 LOGGER.error("Invalid Level {}", pair[0].trim());
+            } else {
+                levelMap.put(level, pair[1].trim());
             }
-            levelMap.put(level, pair[1].trim());
         }
         if (levelMap.size() == 0) {
             return INSTANCE;

Modified: logging/log4j/log4j2/trunk/flume-ng/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/site/xdoc/index.xml?rev=1479660&r1=1479659&r2=1479660&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/site/xdoc/index.xml (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/site/xdoc/index.xml Mon May  6 17:57:05 2013
@@ -80,7 +80,7 @@
               <description>App to test log4j appender</description>
 
               <properties>
-                <log4j.version>2.0-beta1</log4j.version>
+                <log4j.version>2.0-beta6</log4j.version>
                 <slf4j.version>1.6.6</slf4j.version>
                 <jackson.version>1.9.3</jackson.version>
               </properties>



Mime
View raw message