From 98309095065189ad51033e80f5dea694ce2d9331 Mon Sep 17 00:00:00 2001 From: Francis Upton IV Date: Tue, 14 Feb 2012 16:23:14 -0800 Subject: [PATCH] [FIXED JENKINS-7219] EC2 slaves fail to launch when using old (< 1.9) configs --- src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java b/src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java index 1f9dc82ce..d53c475a2 100644 --- a/src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java +++ b/src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java @@ -126,7 +126,8 @@ else if (bootstrapResult == SAMEUSER) scp.put(Hudson.getInstance().getJnlpJars("slave.jar").readFully(), "slave.jar","/tmp"); - String launchString = "java " + computer.getNode().jvmopts + " -jar /tmp/slave.jar"; + String jvmopts = computer.getNode().jvmopts; + String launchString = "java " + (jvmopts != null ? jvmopts : "") + " -jar /tmp/slave.jar"; logger.println("Launching slave agent: " + launchString); final Session sess = conn.openSession(); sess.execCommand(launchString);