From 612689f61c596a6065c833fa036b3a9c3d2ae689 Mon Sep 17 00:00:00 2001 From: Slawomir Jodynski Date: Fri, 9 Aug 2013 16:33:23 +0200 Subject: [PATCH] fixes JENKINS-17171 - token macro expansion not working see https://issues.jenkins-ci.org/browse/JENKINS-17170 --- src/main/java/hudson/plugins/groovy/SystemGroovy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/hudson/plugins/groovy/SystemGroovy.java b/src/main/java/hudson/plugins/groovy/SystemGroovy.java index 7f1c187..0195d8d 100644 --- a/src/main/java/hudson/plugins/groovy/SystemGroovy.java +++ b/src/main/java/hudson/plugins/groovy/SystemGroovy.java @@ -75,7 +75,7 @@ public boolean perform(final AbstractBuild build, new GroovyShell(cl, new Binding(parseProperties(bindings)), compilerConfig); shell.setVariable("build", build); - shell.setVariable("launcher", launcher); + if (launcher != null) shell.setVariable("launcher", launcher); // simple fix for: https://issues.jenkins-ci.org/browse/JENKINS-17171 shell.setVariable("listener", listener); shell.setVariable("out", listener.getLogger());