cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clecl...@apache.org
Subject svn commit: r941081 - in /cxf/branches/2.2.x-fixes: ./ common/common/src/main/java/org/apache/cxf/common/logging/Slf4jLogger.java
Date Tue, 04 May 2010 22:40:18 GMT
Author: cleclerc
Date: Tue May  4 22:40:18 2010
New Revision: 941081

URL: http://svn.apache.org/viewvc?rev=941081&view=rev
Log:
Merged revisions 941080 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r941080 | cleclerc | 2010-05-05 00:37:24 +0200 (Wed, 05 May 2010) | 1 line
  
  [CXF-2751] Fix erroneous optimization
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/Slf4jLogger.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May  4 22:40:18 2010
@@ -1 +1 @@
-/cxf/trunk:935945,935995,936318,937409,938804,939012,939079,939664,939697,939719,940950,941065
+/cxf/trunk:935945,935995,936318,937409,938804,939012,939079,939664,939697,939719,940950,941065,941080

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/Slf4jLogger.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/Slf4jLogger.java?rev=941081&r1=941080&r2=941081&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/Slf4jLogger.java
(original)
+++ cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/Slf4jLogger.java
Tue May  4 22:40:18 2010
@@ -56,20 +56,16 @@ public class Slf4jLogger extends Abstrac
     @Override
     public Level getLevel() {
         Level level;
-        /*
-         * As we can use a "switch ... case" block but only a "if ... else if ..." block,
the order of the
-         * comparisons is important. We assume the the logging framework is most probably
configured at WARN
-         * DEBUG, TRACE, INFO, ... levels
-         */
-        if (logger.isWarnEnabled()) {
-            level = Level.WARNING;
+        // Verify from the wider (trace) to the narrower (error)
+        if (logger.isTraceEnabled()) {
+            level = Level.FINER; // FINEST
         } else if (logger.isDebugEnabled()) {
             // map to the lowest between FINER, FINE and CONFIG
             level = Level.FINER;
-        } else if (logger.isTraceEnabled()) {
-            level = Level.FINEST;
         } else if (logger.isInfoEnabled()) {
             level = Level.INFO;
+        } else if (logger.isWarnEnabled()) {
+            level = Level.WARNING;
         } else if (logger.isErrorEnabled()) {
             level = Level.SEVERE;
         } else {



Mime
View raw message