From f01cc69e5120a2b5c6a3d043b1ab613d202a73ee Mon Sep 17 00:00:00 2001 From: francisu Date: Mon, 8 Jan 2018 15:36:50 -0800 Subject: [PATCH] JENKINS-47331 Fails to launch from configurations before the specification of prefixString (try another way) --- src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java b/src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java index 8d6e20a5c..9150ee636 100644 --- a/src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java +++ b/src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java @@ -191,8 +191,7 @@ protected void launch(EC2Computer computer, TaskListener listener, Instance inst String jvmopts = computer.getNode().jvmopts; String prefix = computer.getSlaveCommandPrefix(); - String launchString = prefix + " java " + (jvmopts != null ? jvmopts : "") + " -jar " + tmpDir + "/slave.jar"; - // launchString = launchString.trim(); + String launchString = (prefix.equals("") ? "java " : prefix + " java ") + (jvmopts != null ? jvmopts : "") + " -jar " + tmpDir + "/slave.jar"; SlaveTemplate slaveTemplate = computer.getSlaveTemplate();