Fix JENKINS-14897

jenkinsci · Aug 26, 2012 · 1adb475 · 1adb475
1 parent 8b24dac
commit 1adb475
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/envinject/service/EnvInjectVariableGetter.java b/src/main/java/org/jenkinsci/plugins/envinject/service/EnvInjectVariableGetter.java
@@ -15,6 +15,7 @@
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.logging.Level;
@@ -159,6 +160,13 @@ public EnvInjectJobProperty getEnvInjectJobProperty(AbstractBuild build) {
     public Map<String, String> getEnvVarsPreviousSteps(AbstractBuild build, EnvInjectLogger logger) throws IOException, InterruptedException, EnvInjectException {
         Map<String, String> result = new HashMap<String, String>();
 
+        List<Environment> environmentList = build.getEnvironments();
+        for (Environment e : environmentList) {
+            if (e != null) {
+                e.buildEnvVars(result);
+            }
+        }
+
         EnvInjectPluginAction envInjectAction = build.getAction(EnvInjectPluginAction.class);
         if (envInjectAction != null) {
             result.putAll(getCurrentInjectedEnvVars(envInjectAction));