[FIXED JENKINS-7219] EC2 slaves fail to launch when using old (< 1.9)…

… configs
jenkinsci · Feb 15, 2012 · 9830909 · 9830909
1 parent 911f293
commit 9830909
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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);