Author: dkulp Date: Thu Aug 8 19:22:09 2013 New Revision: 1511972 URL: http://svn.apache.org/r1511972 Log: Merged revisions 1511961 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1511961 | dkulp | 2013-08-08 15:11:51 -0400 (Thu, 08 Aug 2013) | 10 lines 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.6.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java Modified: cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java?rev=1511972&r1=1511971&r2=1511972&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java (original) +++ cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java Thu Aug 8 19:22:09 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) {
