You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2010/06/18 21:09:43 UTC
svn commit: r956100 - in
/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal:
LifecycleStarter.java LifecycleThreadedBuilder.java
Author: krosenvold
Date: Fri Jun 18 19:09:42 2010
New Revision: 956100
URL: http://svn.apache.org/viewvc?rev=956100&view=rev
Log:
[MNG-4682] Exception upon build failure in parallel builds
Also removed duplicated code line
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleThreadedBuilder.java
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java?rev=956100&r1=956099&r2=956100&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java Fri Jun 18 19:09:42 2010
@@ -29,6 +29,7 @@ import java.util.List;
import java.util.concurrent.CompletionService;
import java.util.concurrent.ExecutorCompletionService;
import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
/**
* Starts the build life cycle
@@ -144,6 +145,9 @@ public class LifecycleStarter
finally
{
executor.shutdown();
+ // If the builder has terminated with an exception we want to catch any stray threads before going
+ // to System.exit in the mavencli.
+ executor.awaitTermination( 5, TimeUnit.SECONDS ) ;
}
}
else
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleThreadedBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleThreadedBuilder.java?rev=956100&r1=956099&r2=956100&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleThreadedBuilder.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleThreadedBuilder.java Fri Jun 18 19:09:42 2010
@@ -66,12 +66,7 @@ public class LifecycleThreadedBuilder
try
{
multiThreadedProjectTaskSegmentBuild( analyzer, reactorContext, session, service, taskSegment, projectBuildMap, muxer );
- if ( reactorContext.getReactorBuildStatus().isHalted() )
- {
- break;
- }
-
- if ( reactorContext.getReactorBuildStatus().isHalted() )
+ if ( reactorContext.getReactorBuildStatus().isHalted( ) )
{
break;
}