Skip to content
Permalink
Browse files

[FIXED JENKINS-17259] don't throw exception in case Token can't be ex…

…panded
  • Loading branch information
imod committed May 5, 2013
1 parent e3ccfd8 commit 587086fdbac0bcabcad37f30b5122ed7c761f7a3
Showing with 2 additions and 2 deletions.
  1. +1 −1 pom.xml
  2. +1 −1 src/main/java/org/jenkinsci/plugins/scriptler/builder/ScriptlerBuilder.java
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>token-macro</artifactId>
<version>1.5.1</version>
<version>1.6</version>
</dependency>

<dependency>
@@ -101,7 +101,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
final List<ParameterValue> jobParams = paramsAction.getParameters();
for (ParameterValue parameterValue : jobParams) {
// pass the params to the token expander in a way that these get expanded by environment variables (params are also environment variables)
expandedParams.add(new Parameter(parameterValue.getName(), TokenMacro.expandAll(build, listener, "${" + parameterValue.getName() + "}")));
expandedParams.add(new Parameter(parameterValue.getName(), TokenMacro.expandAll(build, listener, "${" + parameterValue.getName() + "}", false, null)));
}
}
}

0 comments on commit 587086f

Please sign in to comment.
You can’t perform that action at this time.