未验证 提交 20bc2e89 编写于 作者: O Oleg Nenashev 提交者: GitHub

Merge pull request #3327 from jglick/ParametersAction-NPE-JENKINS-39495

[JENKINS-39495] Defend against a null serialized ParametersAction.parameters
......@@ -87,7 +87,7 @@ public class ParametersAction implements RunAction2, Iterable<ParameterValue>, Q
private Set<String> safeParameters;
private final List<ParameterValue> parameters;
private @Nonnull List<ParameterValue> parameters;
private List<String> parameterDefinitionNames;
......@@ -99,7 +99,7 @@ public class ParametersAction implements RunAction2, Iterable<ParameterValue>, Q
private transient Run<?, ?> run;
public ParametersAction(List<ParameterValue> parameters) {
public ParametersAction(@Nonnull List<ParameterValue> parameters) {
this.parameters = new ArrayList<>(parameters);
String paramNames = SystemProperties.getString(SAFE_PARAMETERS_SYSTEM_PROPERTY_NAME);
safeParameters = new TreeSet<>();
......@@ -284,6 +284,9 @@ public class ParametersAction implements RunAction2, Iterable<ParameterValue>, Q
}
private Object readResolve() {
if (parameters == null) { // JENKINS-39495
parameters = Collections.emptyList();
}
if (build != null)
OldDataMonitor.report(build, "1.283");
if (safeParameters == null) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册