You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ss...@apache.org on 2016/12/27 13:04:27 UTC
svn commit: r1776116 -
/felix/trunk/tools/org.apache.felix.scr.bnd/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java
Author: sseifert
Date: Tue Dec 27 13:04:27 2016
New Revision: 1776116
URL: http://svn.apache.org/viewvc?rev=1776116&view=rev
Log:
FELIX-5466 org.apache.felix.scr.bnd: Adding Target Source URL may lead to NPE
Modified:
felix/trunk/tools/org.apache.felix.scr.bnd/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java
Modified: felix/trunk/tools/org.apache.felix.scr.bnd/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/tools/org.apache.felix.scr.bnd/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java?rev=1776116&r1=1776115&r2=1776116&view=diff
==============================================================================
--- felix/trunk/tools/org.apache.felix.scr.bnd/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java (original)
+++ felix/trunk/tools/org.apache.felix.scr.bnd/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java Tue Dec 27 13:04:27 2016
@@ -304,7 +304,9 @@ public class SCRDescriptorBndPlugin impl
path.add(j.getSource().toURI().toURL());
}
// always add the target url (containing all compiled classes) because it it not necessarily part of the analyzer classpath
- path.add(a.getTarget().getSource().toURI().toURL());
+ if (a.getTarget() != null && a.getTarget().getSource() != null) {
+ path.add(a.getTarget().getSource().toURI().toURL());
+ }
log.info("Using classpath: " + path);
return path.toArray(new URL[path.size()]);
}