You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2010/12/13 15:40:54 UTC

svn commit: r1045145 - in /ant/ivy/core/trunk/src/java/org/apache/ivy: osgi/repo/ResolverManifestIterable.java plugins/resolver/BasicResolver.java

Author: hibou
Date: Mon Dec 13 14:40:54 2010
New Revision: 1045145

URL: http://svn.apache.org/viewvc?rev=1045145&view=rev
Log:
don't break the API

Modified:
    ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/ResolverManifestIterable.java
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/ResolverManifestIterable.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/ResolverManifestIterable.java?rev=1045145&r1=1045144&r2=1045145&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/ResolverManifestIterable.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/ResolverManifestIterable.java Mon Dec 13 14:40:54 2010
@@ -152,7 +152,7 @@ public class ResolverManifestIterable im
                     }
                     artifact = artifacts[indexArtifact++];
                 }
-                ResolvedResource resource = resolver.findArtifactRef(artifact, null);
+                ResolvedResource resource = resolver.doFindArtifactRef(artifact, null);
                 if (resource == null) {
                     artifact = null;
                     continue;

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java?rev=1045145&r1=1045144&r2=1045145&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java Mon Dec 13 14:40:54 2010
@@ -949,7 +949,11 @@ public abstract class BasicResolver exte
         }
     }
 
-    public abstract ResolvedResource findArtifactRef(Artifact artifact, Date date);
+    public ResolvedResource doFindArtifactRef(Artifact artifact, Date date) {
+        return findArtifactRef(artifact, date);
+    }
+
+    protected abstract ResolvedResource findArtifactRef(Artifact artifact, Date date);
 
     protected abstract long get(Resource resource, File dest) throws IOException;