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

…panded
jenkinsci · May 5, 2013 · 587086f · 587086f
1 parent e3ccfd8
commit 587086f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -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>

diff --git a/src/main/java/org/jenkinsci/plugins/scriptler/builder/ScriptlerBuilder.java b/src/main/java/org/jenkinsci/plugins/scriptler/builder/ScriptlerBuilder.java
@@ -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)));
                         }
                     }
                 }