Merge pull request #27 from jacekkowalczyk82/master

proposed solution for issue JENKINS-19015
jenkinsci · Aug 15, 2013 · f9336d9 · f9336d9
2 parents c5647ef + e52309a
commit f9336d9
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/main/java/com/tikal/jenkins/plugins/multijob/MultiJobBuilder.java b/src/main/java/com/tikal/jenkins/plugins/multijob/MultiJobBuilder.java
@@ -31,6 +31,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
@@ -139,6 +140,8 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher,
 						break;
 					} catch (ExecutionException e) {
 						failed = true;
+					} catch (CancellationException e) {
+						failed = true;
 					}
 				} else if (project.isBuilding()) {
 					addSubBuild(multiJobBuild, thisProject,