ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maart...@apache.org
Subject svn commit: r1081947 - /ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java
Date Tue, 15 Mar 2011 21:26:31 GMT
Author: maartenc
Date: Tue Mar 15 21:26:31 2011
New Revision: 1081947

URL: http://svn.apache.org/viewvc?rev=1081947&view=rev
Log:
Removed dead code.

Modified:
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java?rev=1081947&r1=1081946&r2=1081947&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java
Tue Mar 15 21:26:31 2011
@@ -253,11 +253,6 @@ public class LatestCompatibleConflictMan
                     // was already contained in the rest of the stack, the circle is closed,
nothing
                     // else to do
                 } else {
-                    if (callerNode == null) {
-                        // we have reached the root without finding a way to change the blacklist
a
-                        // caller in a particular path, this is a strict conflict
-                        return null;
-                    }
                     callerStack.push(callerNode);
                     Collection sub = blackListIncompatibleCaller(
                         versionMatcher, conflictParent, selectedNode, evictedNode, callerStack);



Mime
View raw message