You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2009/01/09 16:49:42 UTC
svn commit: r733070 - in
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src:
main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
Author: brianf
Date: Fri Jan 9 07:49:41 2009
New Revision: 733070
URL: http://svn.apache.org/viewvc?rev=733070&view=rev
Log:
MNG-3974 - stop on first mirror pattern match (fix to handle repeated entires)
Modified:
maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
Modified: maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=733070&r1=733069&r2=733070&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (original)
+++ maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java Fri Jan 9 07:49:41 2009
@@ -963,7 +963,11 @@
{
ArtifactRepository mirror = new DefaultArtifactRepository( id, url, null );
- mirrors.put( mirrorOf, mirror );
+ //to preserve first wins, don't add repeated mirrors.
+ if (!mirrors.containsKey( mirrorOf ))
+ {
+ mirrors.put( mirrorOf, mirror );
+ }
}
public void setOnline( boolean online )
Modified: maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java?rev=733070&r1=733069&r2=733070&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java (original)
+++ maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java Fri Jan 9 07:49:41 2009
@@ -241,6 +241,8 @@
//exact matches win first
wagonManager.addMirror( "a2", "a,b", "http://a2" );
wagonManager.addMirror( "a", "a", "http://a" );
+ //make sure repeated entries are skipped
+ wagonManager.addMirror( "a", "a", "http://a3" );
wagonManager.addMirror( "b", "b", "http://b" );
wagonManager.addMirror( "c", "d,e", "http://de" );