You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/08/08 21:11:52 UTC

svn commit: r1511961 - /cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java

Author: dkulp
Date: Thu Aug  8 19:11:51 2013
New Revision: 1511961

URL: http://svn.apache.org/r1511961
Log:
Merged revisions 1511299 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1511299 | dkulp | 2013-08-07 09:18:51 -0400 (Wed, 07 Aug 2013) | 2 lines

  Actually, catch throwable as that's what the parent class does and can thus detect a wider range of issues. (example: static inializers failing)

........

Modified:
    cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java

Modified: cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java?rev=1511961&r1=1511960&r2=1511961&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java (original)
+++ cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java Thu Aug  8 19:11:51 2013
@@ -129,9 +129,7 @@ public class CXFExtensionBundleListener 
             Throwable origExc = null;
             try {
                 c = bundle.loadClass(className);
-            } catch (NoClassDefFoundError e) {
-                origExc = e;
-            } catch (ClassNotFoundException e) {
+            } catch (Throwable e) {
                 origExc = e;
             }
             if (c == null) {