You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/07/17 19:20:16 UTC
svn commit: r677642 - in /maven/components/branches/maven-2.0.10-RC:
maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Author: jdcasey
Date: Thu Jul 17 10:20:15 2008
New Revision: 677642
URL: http://svn.apache.org/viewvc?rev=677642&view=rev
Log:
Fix NPE potential.
Modified:
maven/components/branches/maven-2.0.10-RC/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Modified: maven/components/branches/maven-2.0.10-RC/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java?rev=677642&r1=677641&r2=677642&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java (original)
+++ maven/components/branches/maven-2.0.10-RC/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java Thu Jul 17 10:20:15 2008
@@ -384,7 +384,7 @@
}
Artifact relocated = source.retrieveRelocatedArtifact( artifact, localRepository, childRemoteRepositories );
- if ( !artifact.equals( relocated ) )
+ if ( relocated != null && !artifact.equals( relocated ) )
{
artifact = relocated;
child.setArtifact( artifact );
Modified: maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=677642&r1=677641&r2=677642&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original)
+++ maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Thu Jul 17 10:20:15 2008
@@ -92,7 +92,7 @@
if ( rel == null )
{
- return null;
+ return artifact;
}
MavenProject project = rel.project;