Merge branch 'JENKINS-8054'

* JENKINS-8054: Set 'Aborted' result before invoking BuildWrapper's tearDown. Fixes JENKINS-7864 and JENKINS-8054. Originally-Committed-As: 7ef707390d5eb8df2e0244dad1a1708cdca055e2
jenkinsci · Feb 8, 2011 · ca87835 · ca87835
2 parents 80a1b23 + 978a234
commit ca87835
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);