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 2008/04/02 14:43:12 UTC
svn commit: r643883 -
/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Author: brett
Date: Wed Apr 2 05:43:11 2008
New Revision: 643883
URL: http://svn.apache.org/viewvc?rev=643883&view=rev
Log:
[MNG-3495] avoid a potential NPE in the repository hashcode during exceptions for artifact resolution errors if settings.xml is malformed
Merged from: r643880
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=643883&r1=643882&r2=643883&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java Wed Apr 2 05:43:11 2008
@@ -681,7 +681,14 @@
ArtifactRepository mirror = getMirror( repository );
if ( mirror != null )
{
- repository = repositoryFactory.createArtifactRepository( mirror.getId(), mirror.getUrl(),
+ String id = mirror.getId();
+ if ( id == null )
+ {
+ // TODO: this should be illegal in settings.xml
+ id = repository.getId();
+ }
+
+ repository = repositoryFactory.createArtifactRepository( id, mirror.getUrl(),
repository.getLayout(), repository.getSnapshots(),
repository.getReleases() );
}