You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2016/09/16 05:54:36 UTC
svn commit: r1760992 - in /felix/trunk/tools/org.apache.felix.scr.generator:
changelog.txt
src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java
Author: cziegeler
Date: Fri Sep 16 05:54:36 2016
New Revision: 1760992
URL: http://svn.apache.org/viewvc?rev=1760992&view=rev
Log:
FELIX-5328 : NoClassDefFound not wrapped in the ClassScanner
Modified:
felix/trunk/tools/org.apache.felix.scr.generator/changelog.txt
felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java
Modified: felix/trunk/tools/org.apache.felix.scr.generator/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/tools/org.apache.felix.scr.generator/changelog.txt?rev=1760992&r1=1760991&r2=1760992&view=diff
==============================================================================
--- felix/trunk/tools/org.apache.felix.scr.generator/changelog.txt (original)
+++ felix/trunk/tools/org.apache.felix.scr.generator/changelog.txt Fri Sep 16 05:54:36 2016
@@ -2,6 +2,7 @@ Changes from 1.15.0 to 1.14.0
-----------------------------
** Bug
* [FELIX-5304] - SERVICE_PID property should not be created
+ * [FELIX-5328] - NoClassDefFound not wrapped in the ClassScanner
Changes from 1.14.0 to 1.13.0
Modified: felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java
URL: http://svn.apache.org/viewvc/felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java?rev=1760992&r1=1760991&r2=1760992&view=diff
==============================================================================
--- felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java (original)
+++ felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java Fri Sep 16 05:54:36 2016
@@ -144,8 +144,12 @@ public class ClassScanner {
final Class<?> annotatedClass = project.getClassLoader().loadClass(src.getClassName());
this.process(annotatedClass, src, result);
- } catch (final ClassNotFoundException cnfe) {
- throw new SCRDescriptorException("Unable to load compiled class: " + src.getClassName(), src.getFile().toString(), cnfe);
+ } catch ( final SCRDescriptorFailureException e ) {
+ throw e;
+ } catch ( final SCRDescriptorException e ) {
+ throw e;
+ } catch (final Throwable t) { // e.g. NoClassDefFoundError or ClassNotFoundException, see FELIX-5328
+ throw new SCRDescriptorException("Unable to load compiled class: " + src.getClassName(), src.getFile().toString(), t);
}
}
return result;