Author: brianf Date: Fri Jan 9 07:47:00 2009 New Revision: 733068 URL: http://svn.apache.org/viewvc?rev=733068&view=rev Log: MNG-3974 - stop on first mirror pattern match (fix to handle repeated entires)
Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java Modified: maven/components/branches/maven-2.0.x/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.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=733068&r1=733067&r2=733068&view=diff ============================================================================== --- maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java Fri Jan 9 07:47:00 2009 @@ -964,7 +964,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.x/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.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java?rev=733068&r1=733067&r2=733068&view=diff ============================================================================== --- maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java Fri Jan 9 07:47:00 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" );