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:18:04 UTC
svn commit: r608962 -
/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Author: vsiveton
Date: Fri Jan 4 11:18:03 2008
New Revision: 608962
URL: http://svn.apache.org/viewvc?rev=608962&view=rev
Log:
o merged from r608961 (MNG-3288: Invalid systemPath allows build to continue--failing in later phase.)
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=608962&r1=608961&r2=608962&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java Fri Jan 4 11:18:03 2008
@@ -119,16 +119,21 @@
throw new ArtifactNotFoundException(
"System artifact: " + artifact + " has no file attached", artifact );
}
- else if ( !systemFile.exists() )
+
+ if ( !systemFile.isFile() )
+ {
+ throw new ArtifactNotFoundException( "System artifact: " + artifact
+ + " is not a file: " + systemFile, artifact );
+ }
+
+ if ( !systemFile.exists() )
{
throw new ArtifactNotFoundException(
"System artifact: " + artifact + " not found in path: " + systemFile,
artifact );
}
- else
- {
- artifact.setResolved( true );
- }
+
+ artifact.setResolved( true );
}
else if ( !artifact.isResolved() )
{