svn commit: r1228968 - /maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java

[rf...@apache.org]

Author: rfscholte
Date: Sun Jan  8 22:02:52 2012
New Revision: 1228968

URL: http://svn.apache.org/viewvc?rev=1228968&view=rev
Log:
Fix MSHARED-3: Infinite-loop in DefaultDownloader.download
Resolved by throwing a RuntimeException with the alternative, that's be best we can do.
At least it's better than an infinitive loop without a clue

Modified:
    maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java

Modified: maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java?rev=1228968&r1=1228967&r2=1228968&view=diff
==============================================================================
--- maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java (original)
+++ maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java Sun Jan  8 22:02:52 2012
@@ -1,5 +1,8 @@
 package org.apache.maven.shared.downloader;
 
+import java.io.File;
+import java.util.List;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -8,9 +11,6 @@ import org.apache.maven.artifact.resolve
 import org.apache.maven.artifact.resolver.ArtifactResolver;
 import org.apache.maven.artifact.versioning.VersionRange;
 
-import java.io.File;
-import java.util.List;
-
 /**
  * @author Jason van Zyl
  * @plexus.component
@@ -28,7 +28,6 @@ public class DefaultDownloader
      */
     private ArtifactFactory artifactFactory;
 
-    // FIXME! This calls itself, and couldn't work even if it called the other download method!
     public File download( String groupId,
                           String artifactId,
                           String version,
@@ -37,7 +36,8 @@ public class DefaultDownloader
         throws DownloadException, DownloadNotFoundException
 
     {
-        return download( groupId, artifactId, version, localRepository, remoteRepositories );
+        throw new RuntimeException( "Unsupported method, instead use" +
+        		"org.apache.maven.shared.downloader.DefaultDownloader.download( String, String, String, ArtifactRepository, List )" );
     }
 
     public File download( String groupId,