Skip to content
Permalink
Browse files
[JENKINS-41759] Fixed another regression caused by refactoring
  • Loading branch information
rsandell authored and abayer committed Feb 10, 2017
1 parent d460eaf commit 73ecf2531ce7af560933803b7c41cf351d1476b6
Showing with 4 additions and 2 deletions.
  1. +4 −2 ...rc/main/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
}
}

0 comments on commit 73ecf25

Please sign in to comment.