Skip to content

Commit

Permalink
[JENKINS-39495] Defend against a null serialized ParametersAction.par…
Browse files Browse the repository at this point in the history
…ameters.

(cherry picked from commit ff34532)
  • Loading branch information
jglick authored and olivergondza committed Mar 23, 2018
1 parent 1400918 commit 115612b
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions core/src/main/java/hudson/model/ParametersAction.java
Expand Up @@ -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;

Expand All @@ -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<>();
Expand Down Expand Up @@ -284,6 +284,9 @@ public ParametersAction merge(@CheckForNull ParametersAction overrides) {
}

private Object readResolve() {
if (parameters == null) { // JENKINS-39495
parameters = Collections.emptyList();
}
if (build != null)
OldDataMonitor.report(build, "1.283");
if (safeParameters == null) {
Expand Down

0 comments on commit 115612b

Please sign in to comment.