You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2008/01/04 20:16:49 UTC
svn commit: r608961 -
/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Author: vsiveton
Date: Fri Jan 4 11:16:47 2008
New Revision: 608961
URL: http://svn.apache.org/viewvc?rev=608961&view=rev
Log:
MNG-3288: Invalid systemPath allows build to continue--failing in later phase.
o verify that the system-scoped artifact is a file
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=608961&r1=608960&r2=608961&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java Fri Jan 4 11:16:47 2008
@@ -98,15 +98,20 @@
"System artifact: " + artifact + " has no file attached", artifact );
}
- if ( !systemFile.exists() )
+ if ( !systemFile.isFile() )
{
- throw new ArtifactNotFoundException(
- "System artifact: " + artifact + " not found in path: " + systemFile, artifact );
+ throw new ArtifactNotFoundException( "System artifact: " + artifact
+ + " is not a file: " + systemFile, artifact );
}
- else
+
+ if ( !systemFile.exists() )
{
- artifact.setResolved( true );
+ throw new ArtifactNotFoundException(
+ "System artifact: " + artifact + " not found in path: " + systemFile,
+ artifact );
}
+
+ artifact.setResolved( true );
}
else if ( !artifact.isResolved() )
{