[JENKINS-21261]

plugin might erranously put null into the collection, so filter them out
jenkinsci · Feb 15, 2014 · 411c3cf · 411c3cf
1 parent b87b1f1
commit 411c3cf
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/core/src/main/java/hudson/tasks/junit/TestResultAction.java b/core/src/main/java/hudson/tasks/junit/TestResultAction.java
@@ -162,18 +162,19 @@ private TestResult load() {
     public Object getTarget() {
         return getResult();
     }
-    
+
     public List<TestAction> getActions(TestObject object) {
-    	List<TestAction> result = new ArrayList<TestAction>();
-	// Added check for null testData to avoid NPE from issue 4257.
-	if (testData!=null) {
-        for (Data data : testData) {
-            result.addAll(data.getTestAction(object));
+        List<TestAction> result = new ArrayList<TestAction>();
+        // Added check for null testData to avoid NPE from issue 4257.
+        if (testData != null) {
+            for (Data data : testData)
+                for (TestAction ta : data.getTestAction(object))
+                    if (ta != null)
+                        result.add(ta);
         }
+        return Collections.unmodifiableList(result);
     }
-	return Collections.unmodifiableList(result);
-
-    }
+
     public void setData(List<Data> testData) {
 	this.testData = testData;
     }