Fix JENKINS-16575 and JENKINS-16566

jenkinsci · Feb 3, 2013 · 6c20276 · 6c20276
1 parent e0585e4
commit 6c20276
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/main/java/org/jenkinsci/lib/envinject/EnvInjectAction.java b/src/main/java/org/jenkinsci/lib/envinject/EnvInjectAction.java
@@ -48,15 +48,14 @@ public void overrideAll(Map<String, String> all) {
     @SuppressWarnings({"unused", "unchecked"})
     public Map<String, String> getEnvMap() {
         if (envMap == null) {
-
             //Try to fill the envMap from the build injected environment
             //file (injectedEnvVars.txt by default).
             try {
-                envMap = getEnvironment(build);
+                Map<String, String> result = getEnvironment(build);
+                return result == null ? null : UnmodifiableMap.decorate(result);
             } catch (EnvInjectException e) {
                 return null;
             }
-            return envMap;
         }
 
         return UnmodifiableMap.decorate(envMap);