Author: dkulp Date: Tue Oct 27 15:10:58 2009 New Revision: 830224 URL: http://svn.apache.org/viewvc?rev=830224&view=rev Log: Merged revisions 830223 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r830223 | dkulp | 2009-10-27 11:09:58 -0400 (Tue, 27 Oct 2009) | 10 lines Merged revisions 830196 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r830196 | dkulp | 2009-10-27 10:20:39 -0400 (Tue, 27 Oct 2009) | 2 lines A NoClassDefFoundError could also be thrown, not just ClassNotFoundException. Make sure we catch Throwable. ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Oct 27 15:10:58 2009 @@ -0,0 +1,2 @@ +/cxf/branches/2.2.x-fixes:830223 +/cxf/trunk:830196 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java?rev=830224&r1=830223&r2=830224&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java (original) +++ cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java Tue Oct 27 15:10:58 2009 @@ -81,8 +81,10 @@ Thread.currentThread().getContextClassLoader()); getLogger(LogUtils.class).fine("Using " + loggerClass.getName() + " for logging."); } - } catch (Exception ex) { - //ignore + } catch (Throwable ex) { + //ignore - if we get here, some issue prevented the logger class from being loaded. + //maybe a ClassNotFound or NoClassDefFound or similar. Just use j.u.l + loggerClass = null; } }
