diff --git a/core/src/main/java/hudson/tasks/junit/TestResultAction.java b/core/src/main/java/hudson/tasks/junit/TestResultAction.java index 318246d710f73d4f7e22c6534503991e69dae1a2..bd8078637a9065e1e32a790e2006b65a1d1c11e3 100644 --- a/core/src/main/java/hudson/tasks/junit/TestResultAction.java +++ b/core/src/main/java/hudson/tasks/junit/TestResultAction.java @@ -162,18 +162,19 @@ public class TestResultAction extends AbstractTestResultAction public Object getTarget() { return getResult(); } - + public List getActions(TestObject object) { - List result = new ArrayList(); - // Added check for null testData to avoid NPE from issue 4257. - if (testData!=null) { - for (Data data : testData) { - result.addAll(data.getTestAction(object)); + List result = new ArrayList(); + // 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 testData) { this.testData = testData; }