[FIXED JENKINS-26552] Provide a full Computer.environment to @StepCon…

…textParameter EnvVars. Originally-Committed-As: b4900072b0e49c5ba7ab6acfe3962ebbfab66fbf
jenkinsci · Jan 22, 2015 · 3e18af5 · 3e18af5
1 parent 963cfbe
commit 3e18af5
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/cps/src/main/java/org/jenkinsci/plugins/workflow/cps/EnvActionImpl.java b/cps/src/main/java/org/jenkinsci/plugins/workflow/cps/EnvActionImpl.java
@@ -26,7 +26,6 @@
 
 import groovy.lang.GroovyObjectSupport;
 import hudson.EnvVars;
-import hudson.model.Computer;
 import hudson.model.Run;
 import hudson.util.LogTaskListener;
 import java.io.IOException;
@@ -72,14 +71,14 @@ public Map<String,String> getOverriddenEnvironment() {
 
     @Override public Object getProperty(String propertyName) {
         try {
-            String val = getEnvironment().get(propertyName);
-            if (val == null) {
-                Computer computer = CpsThread.current().getContextVariable(Computer.class);
-                if (computer != null) {
-                    return computer.getEnvironment().get(propertyName);
+            EnvVars overridden = CpsThread.current().getContextVariable(EnvVars.class);
+            if (overridden != null) {
+                String val = overridden.get(propertyName);
+                if (val != null) {
+                    return val;
                 }
             }
-            return val;
+            return getEnvironment().get(propertyName);
         } catch (Exception x) {
             LOGGER.log(Level.WARNING, null, x);
             return null;