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 2014/08/20 08:24:24 UTC
git commit: Added check for return value of await
Repository: maven-surefire
Updated Branches:
refs/heads/master aba9d94db -> 11c151ced
Added check for return value of await
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/11c151ce
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/11c151ce
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/11c151ce
Branch: refs/heads/master
Commit: 11c151ced6bb3563da0bcbb5d37916629fdfb415
Parents: aba9d94
Author: Kristian Rosenvold <kr...@apache.org>
Authored: Wed Aug 20 08:21:51 2014 +0200
Committer: Kristian Rosenvold <kr...@apache.org>
Committed: Wed Aug 20 08:21:56 2014 +0200
----------------------------------------------------------------------
.../maven/surefire/junitcore/ConfigurableParallelComputer.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11c151ce/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java
index cf5b2e7..f2cc672 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java
@@ -89,7 +89,10 @@ public class ConfigurableParallelComputer
fService.shutdown();
try
{
- fService.awaitTermination( 10, java.util.concurrent.TimeUnit.SECONDS );
+ if ( !fService.awaitTermination( 10, java.util.concurrent.TimeUnit.SECONDS ) )
+ {
+ throw new RuntimeException( "Executor did not shut down within timeout" );
+ }
}
catch ( InterruptedException e )
{