JENKINS-47331 Fails to launch from configurations before the specific…

…ation of prefixString (try another way)
jenkinsci · Jan 8, 2018 · f01cc69 · f01cc69
1 parent c2004f0
commit f01cc69
Showing 1 changed file with 1 addition and 2 deletions.
diff --git 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();