svn commit: r598991 - /incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java

[xavier]

Author: xavier
Date: Wed Nov 28 05:26:43 2007
New Revision: 598991

URL: http://svn.apache.org/viewvc?rev=598991&view=rev
Log:
avoid using IvyContext when not necessary

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

Modified: 
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java
URL: 
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java?rev=598991&r1=598990&r2=598991&view=diff
==============================================================================
--- 
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java
 (original)
+++ 
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java
 Wed Nov 28 05:26:43 2007
@@ -197,7 +197,7 @@
             }
 
             String rootModuleConf = 
-                
IvyContext.getContext().getResolveData().getReport().getConfiguration();
+                parent.getData().getReport().getConfiguration();
             evicted.markEvicted(
                 new EvictionData(rootModuleConf, parent, this, 
Collections.singleton(selected), 
                     "with blacklisting of " + blacklisted));
@@ -232,8 +232,7 @@
             IvyNode conflictParent, IvyNode selectedNode, IvyNode evictedNode, 
IvyNode node) {
         Collection/*<IvyNodeBlacklist>*/ blacklisted = new 
ArrayList/*<IvyNodeBlacklist>*/();
         Caller[] callers = node.getAllCallers();
-        String rootModuleConf = IvyContext.getContext().getResolveData()
-            .getReport().getConfiguration();
+        String rootModuleConf = 
conflictParent.getData().getReport().getConfiguration();
         for (int i = 0; i < callers.length; i++) {
             IvyNode callerNode = 
node.findNode(callers[i].getModuleRevisionId());
             if (callerNode.isBlacklisted(rootModuleConf)) {