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 2010/07/29 19:49:54 UTC
svn commit: r980522 -
/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java
Author: bentmann
Date: Thu Jul 29 17:49:54 2010
New Revision: 980522
URL: http://svn.apache.org/viewvc?rev=980522&view=rev
Log:
o Avoided creation of broken ThreadLockedArtifact (i.e. don't wrap null artifacts)
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java?rev=980522&r1=980521&r2=980522&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java Thu Jul 29 17:49:54 2010
@@ -111,9 +111,10 @@ public class LifecycleWeaveBuilder
{
for ( MavenProject mavenProject : session.getProjects() )
{
- if ( !( mavenProject.getArtifact() instanceof ThreadLockedArtifact ) )
+ Artifact mainArtifact = mavenProject.getArtifact();
+ if ( mainArtifact != null && !( mainArtifact instanceof ThreadLockedArtifact ) )
{
- ThreadLockedArtifact threadLockedArtifact = new ThreadLockedArtifact( mavenProject.getArtifact() );
+ ThreadLockedArtifact threadLockedArtifact = new ThreadLockedArtifact( mainArtifact );
mavenProject.setArtifact( threadLockedArtifact );
}
}
@@ -211,7 +212,10 @@ public class LifecycleWeaveBuilder
Iterator<ExecutionPlanItem> planItems = executionPlan.iterator();
ExecutionPlanItem current = planItems.hasNext() ? planItems.next() : null;
ThreadLockedArtifact threadLockedArtifact = (ThreadLockedArtifact)projectBuild.getProject().getArtifact();
- threadLockedArtifact.attachToThread();
+ if ( threadLockedArtifact != null )
+ {
+ threadLockedArtifact.attachToThread();
+ }
long buildStartTime = System.currentTimeMillis();
//muxer.associateThreadWithProjectSegment( projectBuild );