Merge pull request #112 from jglick/NPE-JENKINS-42367

[JENKINS-42367] Missing null check
jenkinsci · Mar 2, 2017 · 3c87558 · 3c87558
2 parents 7e0b274 + 2ee7ab7
commit 3c87558
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/ParamsVariable.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/ParamsVariable.java
@@ -82,7 +82,7 @@
 
     private static void addValue(Map<String, Object> values, ParameterValue parameterValue) {
         Object value = parameterValue.getValue();
-        if (!(value instanceof Serializable)) {
+        if (value != null && !(value instanceof Serializable)) {
             boolean canPickle = false;
             for (PickleFactory pf : PickleFactory.all()) {
                 if (pf.writeReplace(value) != null) {

diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/ParamsVariableTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/ParamsVariableTest.java
@@ -60,4 +60,12 @@ public class ParamsVariableTest {
         r.assertLogContains("PASS=s3cr3t", b);
     }
 
+    @Issue("JENKINS-42367")
+    @Test public void nullValue() throws Exception {
+        WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p");
+        p.setDefinition(new CpsFlowDefinition("echo(/TEXT=${params.TEXT}/)",true));
+        p.addProperty(new ParametersDefinitionProperty(new StringParameterDefinition("TEXT", "")));
+        r.assertLogContains("TEXT=null", r.assertBuildStatusSuccess(p.scheduleBuild2(0, new ParametersAction(new StringParameterValue("TEXT", /* not possible via UI, but to simulate other ParameterValue impls */null)))));
+    }
+
 }