FELIX-3886 : ClassNotFound for empty *.java-File
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1442475 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java
index 4217a2b..dd35f2c 100644
--- a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java
+++ b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java
@@ -88,7 +88,7 @@
/** Source for all generated descriptions. */
private static final String GENERATED = "<generated>";
- /** With this syntax array pameters names are returned by reflection API */
+ /** With this syntax array parameters names are returned by reflection API */
private static final Pattern ARRAY_PARAM_TYPE_NAME = Pattern.compile("^\\[L(.*);$");
/** Component descriptions loaded from dependencies*/
@@ -129,7 +129,7 @@
* Scan all source class files for annotations and process them.
*/
public List<ClassDescription> scanSources()
- throws SCRDescriptorException, SCRDescriptorFailureException {
+ throws SCRDescriptorFailureException, SCRDescriptorException {
final List<ClassDescription> result = new ArrayList<ClassDescription>();
for (final Source src : project.getSources()) {
@@ -145,7 +145,7 @@
this.process(annotatedClass, src, result);
} catch (final ClassNotFoundException cnfe) {
- throw new SCRDescriptorFailureException("Unable to load compiled class: " + src.getClassName(), cnfe);
+ throw new SCRDescriptorException("Unable to load compiled class: " + src.getClassName(), src.getFile().toString(), cnfe);
}
}
return result;
@@ -216,7 +216,7 @@
return desc;
}
} catch (final IOException ioe) {
- throw new SCRDescriptorFailureException("Unable to scan class files: " + annotatedClass.getName(), ioe);
+ throw new SCRDescriptorException("Unable to scan class files: " + annotatedClass.getName(), location, ioe);
}
return null;
}