Can revert to the standard Run.getEnvironment(TaskListener) now that …

…Computer.currentComputer is saner (cf. JENKINS-2786). Originally-Committed-As: 4d67cbd404488e810db2c3a5b05ed8fa8f9c692d
jenkinsci · Mar 19, 2015 · 1fca0ae · 1fca0ae
1 parent 38bb27a
commit 1fca0ae
Showing 1 changed file with 1 addition and 2 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
@@ -37,7 +37,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import jenkins.model.RunAction2;
-import org.jenkinsci.plugins.workflow.support.DefaultStepContext;
 import org.jenkinsci.plugins.workflow.support.actions.EnvironmentAction;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
@@ -58,7 +57,7 @@ public class EnvActionImpl extends GroovyObjectSupport implements EnvironmentAct
 
     @Override public EnvVars getEnvironment() throws IOException, InterruptedException {
         if (ownerEnvironment == null) {
-            ownerEnvironment = DefaultStepContext.getEnvironment(owner, new LogTaskListener(LOGGER, Level.INFO));
+            ownerEnvironment = owner.getEnvironment(new LogTaskListener(LOGGER, Level.INFO));
         }
         EnvVars e = new EnvVars(ownerEnvironment);
         e.putAll(env);