提交 411c3cfe 编写于 作者: K Kohsuke Kawaguchi

[JENKINS-21261]

plugin might erranously put null into the collection, so filter them out
上级 b87b1f17
...@@ -162,18 +162,19 @@ public class TestResultAction extends AbstractTestResultAction<TestResultAction> ...@@ -162,18 +162,19 @@ public class TestResultAction extends AbstractTestResultAction<TestResultAction>
public Object getTarget() { public Object getTarget() {
return getResult(); return getResult();
} }
public List<TestAction> getActions(TestObject object) { public List<TestAction> getActions(TestObject object) {
List<TestAction> result = new ArrayList<TestAction>(); List<TestAction> result = new ArrayList<TestAction>();
// Added check for null testData to avoid NPE from issue 4257. // Added check for null testData to avoid NPE from issue 4257.
if (testData!=null) { if (testData != null) {
for (Data data : testData) { for (Data data : testData)
result.addAll(data.getTestAction(object)); 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) { public void setData(List<Data> testData) {
this.testData = testData; this.testData = testData;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册