Author: maartenc Date: Thu Oct 23 16:16:10 2008 New Revision: 707496 URL: http://svn.apache.org/viewvc?rev=707496&view=rev Log: Attempt to fix: "Latest Compatible Conflict Manager + Extra Attributes in Dependencies' IVY files == inifinite loop" (IVY-956)
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitNode.java Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitNode.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitNode.java?rev=707496&r1=707495&r2=707496&view=diff ============================================================================== --- ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitNode.java (original) +++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitNode.java Thu Oct 23 16:16:10 2008 @@ -34,6 +34,7 @@ import org.apache.ivy.core.resolve.IvyNodeEviction.EvictionData; import org.apache.ivy.plugins.conflict.ConflictManager; import org.apache.ivy.util.Checks; +import org.apache.ivy.util.Message; /** * A visit node is an object used to represent one visit from one parent on an [EMAIL PROTECTED] IvyNode} of @@ -272,7 +273,13 @@ rootModuleConf, getParentNode(), parentConf, conf, shouldBePublic, getUsage()); if (loaded) { useRealNode(); - + + // check if the real node is blacklisted -> if so, skip further loading + if (getRealNode().isBlacklisted(rootModuleConf)) { + Message.debug(rootModuleConf + " is blacklisted. Skip loading"); + return false; + } + // if the loaded revision is different from original one // we now register this node on the new resolved id // this includes two cases: @@ -385,7 +392,7 @@ public boolean hasProblem() { return node.hasProblem(); } - + public Configuration getConfiguration(String conf) { return node.getConfiguration(conf); }