Author: brett
Date: Mon Jun 26 10:44:16 2006
New Revision: 417254
URL: http://svn.apache.org/viewvc?rev=417254&view=rev
Log:
merge r417253 from trunk
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.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=417254&r1=417253&r2=417254&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
Mon Jun 26 10:44:16 2006
@@ -62,6 +62,8 @@
extends AbstractLogEnabled
implements WagonManager, Contextualizable
{
+ private static final String WILDCARD = "*";
+
private PlexusContainer container;
// TODO: proxies, authentication and mirrors are via settings, and should
come in via an alternate method - perhaps
@@ -617,7 +619,12 @@
public ArtifactRepository getMirror( String mirrorOf )
{
- return (ArtifactRepository) mirrors.get( mirrorOf );
+ ArtifactRepository repository = (ArtifactRepository) mirrors.get(
mirrorOf );
+ if ( repository == null )
+ {
+ repository = (ArtifactRepository) mirrors.get( WILDCARD );
+ }
+ return repository;
}
/**
