You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2009/05/03 20:42:37 UTC
svn commit: r771098 -
/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
Author: hibou
Date: Sun May 3 18:42:36 2009
New Revision: 771098
URL: http://svn.apache.org/viewvc?rev=771098&view=rev
Log:
IVYDE-176: fix a bug introduced in r769320: NPE when the resolve fail
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java?rev=771098&r1=771097&r2=771098&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java Sun May 3 18:42:36 2009
@@ -179,7 +179,9 @@
Map result = new HashMap();
for (Iterator it = r.getDependencies().iterator(); it.hasNext();) {
IvyNode node = (IvyNode) it.next();
- result.put(node.getResolvedId(), node.getDescriptor().getAllArtifacts());
+ if (node.getDescriptor() != null) {
+ result.put(node.getResolvedId(), node.getDescriptor().getAllArtifacts());
+ }
}
return result;
}