From 8cd46e7918ecab940f33e1ff81c3c2df18dc4f54 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Thu, 22 Dec 2016 11:55:44 +1100 Subject: [PATCH] Issue #1195 --- .../main/java/org/eclipse/jetty/start/StartArgs.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java index e9398eaf829..74578d2be36 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java @@ -552,6 +552,11 @@ public class StartArgs { CommandLineBuilder cmd = new CommandLineBuilder(); + // Special Stop/Shutdown properties + ensureSystemPropertySet("STOP.PORT"); + ensureSystemPropertySet("STOP.KEY"); + ensureSystemPropertySet("STOP.WAIT"); + if (addJavaInit) { cmd.addRawArg(CommandLineBuilder.findJavaBin()); @@ -577,11 +582,7 @@ public class StartArgs cmd.addRawArg(getMainClassname()); } - // Special Stop/Shutdown properties - ensureSystemPropertySet("STOP.PORT"); - ensureSystemPropertySet("STOP.KEY"); - ensureSystemPropertySet("STOP.WAIT"); - + // pass properties as args or as a file if (dryRun && exec_properties==null) {