From EnvironmentAction.getProperty, an EnvironmentExpander has to app…

…ly even to a contextual EnvVars with a definition of this variable.
karlhaas · Mar 27, 2015 · bb86ec9 · bb86ec9
1 parent cd30c06
commit bb86ec9
Showing 1 changed file with 5 additions and 1 deletion.
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
@@ -71,15 +71,19 @@ public Map<String,String> getOverriddenEnvironment() {
 
     @Override public Object getProperty(String propertyName) {
         try {
+            EnvironmentExpander expander = CpsThread.current().getContextVariable(EnvironmentExpander.class);
             EnvVars overridden = CpsThread.current().getContextVariable(EnvVars.class);
             if (overridden != null) {
+                if (expander != null) {
+                    overridden = new EnvVars(overridden);
+                    expander.expand(overridden);
+                }
                 String val = overridden.get(propertyName);
                 if (val != null) {
                     return val;
                 }
             }
             EnvVars environment = getEnvironment();
-            EnvironmentExpander expander = CpsThread.current().getContextVariable(EnvironmentExpander.class);
             if (expander != null) {
                 expander.expand(environment);
             }