[JENKINS-18852] Do not show health report for aggregated result.

jenkinsci · Aug 9, 2013 · 28eb786 · 28eb786
1 parent af19cb7
commit 28eb786
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/main/java/hudson/plugins/warnings/AggregatedWarningsResultAction.java b/src/main/java/hudson/plugins/warnings/AggregatedWarningsResultAction.java
@@ -2,7 +2,7 @@
 
 import hudson.model.AbstractBuild;
 
-import hudson.plugins.analysis.core.HealthDescriptor;
+import hudson.plugins.analysis.core.NullHealthDescriptor;
 import hudson.plugins.analysis.core.AbstractResultAction;
 import hudson.plugins.analysis.core.PluginDescriptor;
 
@@ -14,19 +14,18 @@
  * @author Sebastian Hansbauer
  */
 public class AggregatedWarningsResultAction extends AbstractResultAction<AggregatedWarningsResult> {
+    private static final NullHealthDescriptor NULL_HEALTH_DESCRIPTOR = new NullHealthDescriptor();
+
     /**
      * Creates a new instance of <code>WarningsResultAction</code>.
      *
      * @param owner
      *            the associated build of this action
-     * @param healthDescriptor
-     *            health descriptor to use
      * @param result
      *            the result in this build
      */
-    public AggregatedWarningsResultAction(final AbstractBuild<?, ?> owner, final HealthDescriptor healthDescriptor,
-            final AggregatedWarningsResult result) {
-        super(owner, new WarningsHealthDescriptor(healthDescriptor), result);
+    public AggregatedWarningsResultAction(final AbstractBuild<?, ?> owner, final AggregatedWarningsResult result) {
+        super(owner, NULL_HEALTH_DESCRIPTOR, result);
     }
 
     @Override

diff --git a/src/main/java/hudson/plugins/warnings/WarningsPublisher.java b/src/main/java/hudson/plugins/warnings/WarningsPublisher.java
@@ -329,7 +329,7 @@ protected boolean perform(final AbstractBuild<?, ?> build, final Launcher launch
 
             BuildHistory history = new BuildHistory(build, AggregatedWarningsResultAction.class, useOnlyStableBuildsAsReference());
             AggregatedWarningsResult result = new AggregatedWarningsResult(build, history, totals, getDefaultEncoding());
-            build.getActions().add(new AggregatedWarningsResultAction(build, this, result));
+            build.getActions().add(new AggregatedWarningsResultAction(build, result));
 
             copyFilesWithAnnotationsToBuildFolder(build.getRootDir(), launcher.getChannel(), totals.getAnnotations());