JENKINS-27665: Avoid NPE when sensibleVariables isn't set

usecase: EnvInjectAction.writeReplace() is called after a promotion (promoted build plugin) launched from a build recorded before jenkins was restarted. EnvInjectAction.overrideAll() isn't called thus sensibleVariables is null.
jenkinsci · Jul 9, 2015 · b2ffaa0 · b2ffaa0
1 parent 0033cdf
commit b2ffaa0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/lib/envinject/EnvInjectAction.java b/src/main/java/org/jenkinsci/lib/envinject/EnvInjectAction.java
@@ -91,7 +91,7 @@ private Object writeReplace() throws ObjectStreamException {
                 dao.saveEnvironment(build.getRootDir(), Maps.transformEntries(envMap,
                         new Maps.EntryTransformer<String, String, String>() {
                             public String transformEntry(String key, String value) {
-                                return sensibleVariables.contains(key) ? "********" : value;
+                                return sensibleVariables != null && sensibleVariables.contains(key) ? "********" : value;
                             }
                         }));
                 return this;