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

[dkulp]

Author: dkulp
Date: Thu Aug  8 19:22:05 2013
New Revision: 1511971

URL: http://svn.apache.org/r1511971
Log:
Merged revisions 1511960 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1511960 | dkulp | 2013-08-08 15:11:48 -0400 (Thu, 08 Aug 2013) | 10 lines

  Merged revisions 1511294 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1511294 | dkulp | 2013-08-07 09:05:15 -0400 (Wed, 07 Aug 2013) | 2 lines

    Also catch the NoClassDefFound error

  ........

........

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=1511971&r1=1511970&r2=1511971&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:05 2013
@@ -126,9 +126,11 @@ public class CXFExtensionBundleListener 
 
         protected Class<?> tryClass(String name, ClassLoader cl) {
             Class<?> c = null;
-            ClassNotFoundException origExc = null;
+            Throwable origExc = null;
             try {
                 c = bundle.loadClass(className);
+            } catch (NoClassDefFoundError e) {
+                origExc = e;
             } catch (ClassNotFoundException e) {
                 origExc = e;
             }