[JENKINS-10627] [JENKINS-9158] Stop publisher if job is aborted.

jenkinsci · Aug 19, 2011 · 67001d6 · 67001d6
1 parent f92ec64
commit 67001d6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/main/java/hudson/plugins/analysis/core/HealthAwarePublisher.java b/src/main/java/hudson/plugins/analysis/core/HealthAwarePublisher.java
@@ -307,7 +307,15 @@ protected Object readResolve() {
     public final boolean perform(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) throws InterruptedException, IOException {
         PluginLogger logger = new PluginLogger(listener.getLogger(), pluginName);
         if (canContinue(build.getResult())) {
-            BuildResult result = perform(build, logger);
+            BuildResult result;
+            try {
+                result = perform(build, logger);
+            }
+            catch (InterruptedException exception) {
+                logger.log(exception.getMessage());
+
+                return false;
+            }
 
             if (new NullHealthDescriptor(this).isThresholdEnabled()) {
                 result.evaluateStatus(getThresholds(), useDeltaValues, logger);

diff --git a/src/main/java/hudson/plugins/analysis/core/HealthAwareReporter.java b/src/main/java/hudson/plugins/analysis/core/HealthAwareReporter.java
@@ -236,7 +236,15 @@ public final boolean postExecute(final MavenBuildProxy build, final MavenProject
             return true;
         }
 
-        final ParserResult result = perform(build, pom, mojo, logger);
+        final ParserResult result;
+        try {
+            result = perform(build, pom, mojo, logger);
+        }
+        catch (InterruptedException exception) {
+            logger.log(exception.getMessage());
+
+            return false;
+        }
         logger.logLines(result.getLogMessages());
 
         defaultEncoding = pom.getProperties().getProperty("project.build.sourceEncoding");