From 84e485fc5e608bccf080bf46c0e31c43c6bef474 Mon Sep 17 00:00:00 2001
From: Stephen Connolly <stephen.alan.connolly@gmail.com>
Date: Mon, 27 Apr 2015 14:47:47 +0100
Subject: [PATCH] [FIXED JENKINS-28111] JNLP slave JVM Options are
 inconsistently applied

---
 core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly b/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly
index cd294f04d6..1a2c827759 100644
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly
+++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly
@@ -57,7 +57,7 @@ THE SOFTWARE.
                 <p>
                   ${%Or if the slave is headless:}
                 </p>
-                <pre>java -jar <a href="${rootURL}/jnlpJars/slave.jar">slave.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp</pre>
+                <pre>java ${it.launcher.vmargs}${it.launcher.vmargs==null?'':' '}-jar <a href="${rootURL}/jnlpJars/slave.jar">slave.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp</pre>
               </li>
             </j:when>
             <j:otherwise>
@@ -66,7 +66,7 @@ THE SOFTWARE.
                   ${%Run from slave command line:}
                 </p>
                 <!-- TODO conceal secret w/ JS if possible -->
-                <pre>java -jar <a href="${rootURL}/jnlpJars/slave.jar">slave.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp -secret ${it.jnlpMac}</pre>
+                <pre>java ${it.launcher.vmargs}${it.launcher.vmargs==null?'':' '}-jar <a href="${rootURL}/jnlpJars/slave.jar">slave.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp -secret ${it.jnlpMac}</pre>
               </li>
             </j:otherwise>
           </j:choose>
-- 
GitLab