[JENKINS-34439] Clover plugin still has problems with pipeline builds

CloverBuildAction.java: - Refactored this.projectAction access
jenkinsci · Jun 26, 2017 · 02b1838 · 02b1838
1 parent 18ee107
commit 02b1838
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/src/main/java/hudson/plugins/clover/CloverBuildAction.java b/src/main/java/hudson/plugins/clover/CloverBuildAction.java
@@ -134,6 +134,15 @@ static CloverBuildAction getPreviousResult(Run<?, ?> start) {
         }
     }
 
+    private List<CloverProjectAction> getActions()
+    {
+        if( this.projectActions == null )
+        {
+            this.projectActions = new ArrayList<CloverProjectAction>();  
+        }
+        return this.projectActions;
+    }
+
     CloverBuildAction(String workspacePath, ProjectCoverage r, CoverageTarget healthyTarget, CoverageTarget unhealthyTarget) {
         if (r != null) {
             reports.put(this, r);
@@ -156,20 +165,13 @@ static CloverBuildAction getPreviousResult(Run<?, ?> start) {
         if (c != null) {
             c.setOwner(build);
         }
-        if( this.projectActions == null )
-        {
-            this.projectActions = new ArrayList<CloverProjectAction>();  
-        }
-        this.projectActions.add(new CloverProjectAction(build.getParent()));  
+
+        getActions().add(new CloverProjectAction(build.getParent()));  
     }
 
     @Override public void onLoad(Run<?,?> r) {
         owner = r;
-        if( this.projectActions == null )
-        {
-            this.projectActions = new ArrayList<CloverProjectAction>();  
-        }
-        this.projectActions.add(new CloverProjectAction(r.getParent()));  
+        getActions().add(new CloverProjectAction(r.getParent()));  
     }
 
     /**
@@ -296,7 +298,7 @@ public int getPackages() {
 
     @Override  
     public Collection<? extends Action> getProjectActions() {  
-        return this.projectActions;  
+        return getActions();  
     }  
 
     private static final Logger logger = Logger.getLogger(CloverBuildAction.class.getName());