[JENKINS-41759] Fixed another regression caused by refactoring

jenkinsci · Feb 10, 2017 · 73ecf25 · 73ecf25
1 parent d460eaf
commit 73ecf25
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...resources/org/jenkinsci/plugins/pipeline/modeldefinition/PropertiesToMapTranslator.groovy b/...resources/org/jenkinsci/plugins/pipeline/modeldefinition/PropertiesToMapTranslator.groovy
@@ -58,15 +58,17 @@ public class PropertiesToMapTranslator implements MethodMissingWrapper, Serializ
         }
 
         if (resolveEnvironmentContributors) {
-            UninstantiatedDescribable retVal
+            def retVal
             if (argValue != null) {
                 retVal = script."${s}"(argValue)
             } else {
                 retVal = script."${s}"()
             }
 
-            if (isOfType(retVal, DeclarativeEnvironmentContributor.class)) {
+            if (retVal instanceof UninstantiatedDescribable && isOfType(retVal, DeclarativeEnvironmentContributor.class)) {
                 return retVal.instantiate()
+            } else {
+                return retVal
             }
         }