You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/06/25 17:07:24 UTC
svn commit: r788380 - in /maven/components/branches/maven-2.1.x: ./
maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Author: bentmann
Date: Thu Jun 25 15:07:24 2009
New Revision: 788380
URL: http://svn.apache.org/viewvc?rev=788380&view=rev
Log:
[MNG-4218] NPE in AbstractArtifactResolutionException if DefaultArtifactResolver.resolveTransitively is interrupted
o Merged from r788378
Modified:
maven/components/branches/maven-2.1.x/ (props changed)
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Propchange: maven/components/branches/maven-2.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 25 15:07:24 2009
@@ -3,6 +3,6 @@
/maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC:688883,689695,689976,689990,752168,752428,752622,752653,753089-753090,753320,755086,755199,755215
/maven/components/branches/maven-2.1.x:751686
-/maven/components/branches/maven-2.2.x:769913,779768,780740
+/maven/components/branches/maven-2.2.x:769913,779768,780740,788378
/maven/components/trunk:572229,720001,721902,726845,729292
/maven/sandbox/branches/maven/MNG-3379:678167
Modified: maven/components/branches/maven-2.1.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.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=788380&r1=788379&r2=788380&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java (original)
+++ maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java Thu Jun 25 15:07:24 2009
@@ -347,7 +347,7 @@
}
catch ( InterruptedException e )
{
- throw new ArtifactResolutionException( "Resolution interrupted", null, e );
+ throw new ArtifactResolutionException( "Resolution interrupted", originatingArtifact, e );
}
if ( !resolutionExceptions.isEmpty() )