ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1414839 - /ant/ivy/core/trunk/src/java/org/apache/ivy/core/report/ResolveReport.java
Date Wed, 28 Nov 2012 17:50:16 GMT
Author: hibou
Date: Wed Nov 28 17:50:15 2012
New Revision: 1414839

URL: http://svn.apache.org/viewvc?rev=1414839&view=rev
Log:
Properly handle evicted nodes

Modified:
    ant/ivy/core/trunk/src/java/org/apache/ivy/core/report/ResolveReport.java

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/report/ResolveReport.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/report/ResolveReport.java?rev=1414839&r1=1414838&r2=1414839&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/report/ResolveReport.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/report/ResolveReport.java Wed Nov 28 17:50:15
2012
@@ -345,20 +345,23 @@ public class ResolveReport {
         // get dependencies
         for (int i = 0; i < dependencies.size(); i++) {
             IvyNode node = (IvyNode) dependencies.get(i);
-            if (node.getAllArtifacts().length == 0) {
-                // no artifact: it was probably useful transitively, hence it is useless
here
-                continue;
-            }
-            DefaultDependencyDescriptor dep = new DefaultDependencyDescriptor(fixedmd,
-                    node.getResolvedId(), true, false, false);
             String[] rootConfs = node.getRootModuleConfigurations();
             for (int j = 0; j < rootConfs.length; j++) {
+                if (node.isEvicted(rootConfs[j])) {
+                    continue;
+                }
+                if (node.getAllArtifacts().length == 0) {
+                    // no artifact: it was probably useful transitively, hence it is useless
here
+                    break;
+                }
+                DefaultDependencyDescriptor dep = new DefaultDependencyDescriptor(fixedmd,
+                        node.getResolvedId(), true, false, false);
                 String[] targetConfs = node.getConfigurations(rootConfs[j]);
                 for (int k = 0; k < targetConfs.length; k++) {
                     dep.addDependencyConfiguration(rootConfs[j], targetConfs[k]);
                 }
+                fixedmd.addDependency(dep);
             }
-            fixedmd.addDependency(dep);
         }
 
         return fixedmd;



Mime
View raw message