FindBugs: Prevent NullPointerException if EnvInjectPluginAction#getEn…

…vInjectVarList gets called for null envMap
jenkinsci · Sep 18, 2016 · dae9348 · dae9348
1 parent ac6a105
commit dae9348
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectPluginAction.java b/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectPluginAction.java
@@ -4,6 +4,7 @@
 import hudson.EnvVars;
 import hudson.model.AbstractBuild;
 import hudson.model.EnvironmentContributingAction;
+import java.util.Collections;
 import org.jenkinsci.lib.envinject.EnvInjectAction;
 
 import java.util.Map;
@@ -45,6 +46,9 @@ public Object getTarget() {
 
     @Nonnull
     private EnvInjectVarList getEnvInjectVarList() {
+        if (envMap == null) {
+            return new EnvInjectVarList(Collections.<String,String>emptyMap());
+        }
         return new EnvInjectVarList(Maps.transformEntries(envMap,
                 new Maps.EntryTransformer<String, String, String>() {
                     public String transformEntry(String key, String value) {