From 41feea7e01eac603d17f1e840cb60ae2126298a2 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Fri, 15 Mar 2013 14:38:53 +1100 Subject: [PATCH] 402844 STOP.PORT & STOP.KEY behaviour has changed --- .../src/main/java/org/eclipse/jetty/server/Server.java | 8 +++++--- .../java/org/eclipse/jetty/server/ShutdownMonitor.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java index 8723a493c47..5b5af362210 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java @@ -261,10 +261,12 @@ public class Server extends HandlerWrapper implements Attributes @Override protected void doStart() throws Exception { - if (getStopAtShutdown()) { - ShutdownThread.register(this); - ShutdownMonitor.getInstance().start(); // initialize + if (getStopAtShutdown()) + { + ShutdownThread.register(this); } + + ShutdownMonitor.getInstance().start(); // initialize LOG.info("jetty-"+__version); HttpGenerator.setServerVersion(__version); diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java index 405ce12f6fa..39d38e71af1 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java @@ -75,7 +75,7 @@ public class ShutdownMonitor extends Thread // Use values passed thru via /jetty-start/ this.port = Integer.parseInt(props.getProperty("STOP.PORT","-1")); - this.key = props.getProperty("STOP.KEY","eclipse"); + this.key = props.getProperty("STOP.KEY",null); this.exitVm = true; }