ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gscok...@apache.org
Subject svn commit: r683612 - /ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
Date Thu, 07 Aug 2008 13:15:08 GMT
Author: gscokart
Date: Thu Aug  7 06:15:08 2008
New Revision: 683612

URL: http://svn.apache.org/viewvc?rev=683612&view=rev
Log:
minor optimization (avoid 1 copy) (IVY-872)

Modified:
    ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java?rev=683612&r1=683611&r2=683612&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java Thu Aug  7
06:15:08 2008
@@ -791,7 +791,6 @@
                         Message.debug(node + " was previously evicted in root module conf
"
                                 + node.getRootModuleConf());
                     }
-
                     node.markEvicted(evictionData);
                     if (debugConflictResolution) {
                         Message.debug("evicting " + node + " by " + evictionData);
@@ -804,8 +803,8 @@
         }
 
         // compute conflicts
-        Collection resolvedNodes = new HashSet(ancestor.getNode().getResolvedNodes(
-            node.getModuleId(), node.getRootModuleConf()));
+        Set resolvedNodes = ancestor.getNode().getResolvedNodes(node.getModuleId(), 
+                                                                node.getRootModuleConf());
         resolvedNodes.addAll(ancestor.getNode().getPendingConflicts(node.getRootModuleConf(),
             node.getModuleId()));
         Collection conflicts = computeConflicts(node, ancestor, conf, toevict, resolvedNodes);



Mime
View raw message