[JENKINS-19539] Do not (try to) generate coverage information if buil…

…d was aborted
jenkinsci · Sep 11, 2013 · acdd801 · acdd801
1 parent 43443ec
commit acdd801
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/hudson/plugins/jacoco/JacocoBuildAction.java b/src/main/java/hudson/plugins/jacoco/JacocoBuildAction.java
@@ -239,7 +239,7 @@ public JacocoBuildAction getPreviousResult() {
 			b = b.getPreviousBuild();
 			if(b==null)
 				return null;
-			if(b.getResult()== Result.FAILURE)
+			if(b.getResult()== Result.FAILURE || b.getResult() == Result.ABORTED)
 				continue;
 			JacocoBuildAction r = b.getAction(JacocoBuildAction.class);
 			if(r!=null)

diff --git a/src/main/java/hudson/plugins/jacoco/JacocoProjectAction.java b/src/main/java/hudson/plugins/jacoco/JacocoProjectAction.java
@@ -41,7 +41,7 @@ public String getUrlName() {
      */
     public JacocoBuildAction getLastResult() {
         for (AbstractBuild<?, ?> b = project.getLastBuild(); b != null; b = b.getPreviousBuild()) {
-            if (b.getResult() == Result.FAILURE)
+            if (b.getResult() == Result.FAILURE || b.getResult() == Result.ABORTED)
                 continue;
             JacocoBuildAction r = b.getAction(JacocoBuildAction.class);
             if (r != null)

diff --git a/src/main/java/hudson/plugins/jacoco/JacocoPublisher.java b/src/main/java/hudson/plugins/jacoco/JacocoPublisher.java
@@ -304,7 +304,7 @@ public boolean perform(AbstractBuild<?,?> build, Launcher launcher, BuildListene
 		FilePath[] matchedClassDirs = null;
 		FilePath[] matchedSrcDirs = null;
 
-		if (build.getResult().equals(Result.FAILURE)) {
+		if (build.getResult() == Result.FAILURE || build.getResult() == Result.ABORTED) {
 			return true;
 		}