Author: brett
Date: Wed Apr 2 05:41:45 2008
New Revision: 643880
URL: http://svn.apache.org/viewvc?rev=643880&view=rev
Log:
[MNG-3495] avoid a potential NPE in the repository hashcode during exceptions
for artifact resolution errors if settings.xml is malformed
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=643880&r1=643879&r2=643880&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
Wed Apr 2 05:41:45 2008
@@ -596,7 +596,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() );
}
