logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpo...@apache.org
Subject svn commit: r1561715 - in /logging/log4j/log4j2/trunk: log4j-1.2-api/src/main/java/org/apache/log4j/Category.java src/changes/changes.xml
Date Mon, 27 Jan 2014 16:00:11 GMT
Author: rpopma
Date: Mon Jan 27 16:00:11 2014
New Revision: 1561715

URL: http://svn.apache.org/r1561715
Log:
LOG4J2-517 Switch in log4j-1.2-api Category.getEffectiveLevel has no cases for FATAL, OFF.

Modified:
    logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java
    logging/log4j/log4j2/trunk/src/changes/changes.xml

Modified: logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java?rev=1561715&r1=1561714&r2=1561715&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java
(original)
+++ logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java
Mon Jan 27 16:00:11 2014
@@ -164,8 +164,12 @@ public class Category {
                 return Level.INFO;
             case WARN:
                 return Level.WARN;
-            default:
+            case ERROR:
                 return Level.ERROR;
+            case FATAL:
+                return Level.FATAL;
+            default:
+                return Level.OFF;
         }
     }
 

Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1561715&r1=1561714&r2=1561715&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Mon Jan 27 16:00:11 2014
@@ -21,6 +21,9 @@
   </properties>
   <body>
     <release version="2.0-RC1" date="2014-MM-DD" description="Bug fixes and enhancements">
+      <action issue="LOG4J2-517" dev="rpopma" type="fix">
+        Switch in log4j-1.2-api Category.getEffectiveLevel has no cases for FATAL, OFF.
+      </action>
       <action issue="LOG4J2-41" dev="rgoers" type="update" due-to="Nick Williams">
         Add support for custom logging levels.
       </action>



Mime
View raw message