Set 'Aborted' result before invoking BuildWrapper's tearDown. Fixes J…

…ENKINS-7864 and JENKINS-8054. Originally-Committed-As: 9c965617b3b385ef65eaf50860865c05a114a01d
jenkinsci · Feb 7, 2011 · 978a234 · 978a234
1 parent 768fd5d
commit 978a234
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/main/java/hudson/maven/MavenModuleSetBuild.java b/src/main/java/hudson/maven/MavenModuleSetBuild.java
@@ -24,6 +24,7 @@
  */
 package hudson.maven;
 
+import static hudson.model.Result.ABORTED;
 import static hudson.model.Result.FAILURE;
 import hudson.AbortException;
 import hudson.EnvVars;
@@ -651,6 +652,9 @@ protected Result doRun(final BuildListener listener) throws Exception {
                                 process.discard();
                             }
                         }
+                    } catch (InterruptedException e) {
+                        r = ABORTED;
+                        throw e;
                     } finally {
                         if (r != null) {
                             setResult(r);