svn commit: r560268 - in /incubator/ivy/core/trunk: CHANGES.txt src/java/org/apache/ivy/ant/IvyCacheTask.java

[gscokart]

Author: gscokart
Date: Fri Jul 27 08:10:24 2007
New Revision: 560268

URL: http://svn.apache.org/viewvc?view=rev&rev=560268
Log:
FIX: cachepath based on a resolve done in a previous build broken (IVY-583)

Modified:
    incubator/ivy/core/trunk/CHANGES.txt
    incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCacheTask.java

Modified: incubator/ivy/core/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/CHANGES.txt?view=diff&rev=560268&r1=560267&r2=560268
==============================================================================
--- incubator/ivy/core/trunk/CHANGES.txt (original)
+++ incubator/ivy/core/trunk/CHANGES.txt Fri Jul 27 08:10:24 2007
@@ -51,6 +51,7 @@
 
    version in SVN
 =====================================
+- FIX: cachepath based on a resolve done in a previous build broken (IVY-583)
 
    2.0.0-alpha2-incubating
 =====================================

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCacheTask.java
URL: 
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCacheTask.java?view=diff&rev=560268&r1=560267&r2=560268
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCacheTask.java 
(original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCacheTask.java Fri 
Jul 27 08:10:24 2007
@@ -34,6 +34,7 @@
 import org.apache.ivy.core.report.ArtifactDownloadReport;
 import org.apache.ivy.core.report.ConfigurationResolveReport;
 import org.apache.ivy.core.report.ResolveReport;
+import org.apache.ivy.core.resolve.ResolveOptions;
 import org.apache.ivy.plugins.report.XmlReportParser;
 import org.apache.ivy.util.Message;
 import org.apache.tools.ant.BuildException;
@@ -85,8 +86,12 @@
 
             XmlReportParser parser = new XmlReportParser();
             CacheManager cacheMgr = 
getIvyInstance().getCacheManager(getCache());
+            String resolvedId = getResolveId();
+            if (resolvedId==null) {
+                resolvedId = 
ResolveOptions.getDefaultResolveId(getResolvedModuleId());
+            }
             for (int i = 0; i < confs.length; i++) {
-                File reportFile = 
cacheMgr.getConfigurationResolveReportInCache(getResolveId(),
+                File reportFile = 
cacheMgr.getConfigurationResolveReportInCache(resolvedId,
                     confs[i]);
                 parser.parse(reportFile);