cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r964891 - in /cxf/branches/2.2.x-fixes: ./ common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java
Date Fri, 16 Jul 2010 17:58:43 GMT
Author: dkulp
Date: Fri Jul 16 17:58:43 2010
New Revision: 964891

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

........
  r964889 | dkulp | 2010-07-16 13:58:01 -0400 (Fri, 16 Jul 2010) | 1 line
  
  [CXF-2893] Check default classloader for logger class
........

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/LogUtils.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 16 17:58:43 2010
@@ -1 +1 @@
-/cxf/trunk:964618,964818,964822,964853
+/cxf/trunk:964618,964818,964822,964853,964889

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/LogUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java?rev=964891&r1=964890&r2=964891&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java
(original)
+++ cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java
Fri Jul 16 17:58:43 2010
@@ -95,8 +95,12 @@ public final class LogUtils {
                 }
             }
             if (!StringUtils.isEmpty(cname)) {
-                loggerClass = Class.forName(cname.trim(), true,
-                                            Thread.currentThread().getContextClassLoader());
+                try {
+                    loggerClass = Class.forName(cname.trim(), true,
+                                                Thread.currentThread().getContextClassLoader());
+                } catch (Throwable ex) {
+                    loggerClass = Class.forName(cname.trim());
+                }
                 getLogger(LogUtils.class).fine("Using " + loggerClass.getName() + " for logging.");
             }
         } catch (Throwable ex) {



Mime
View raw message