Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2015-11-05 12:34:30 -0500
committerJoakim Erdfelt2015-11-05 12:34:30 -0500
commitc8ec399af24708ed4888a67af2e9b97edc7b110d (patch)
tree80379b5384badf3460b34a9f56b0512f89dd8af4
parente0963543d28087d7295476dbfa3d5b6e17ea339d (diff)
parent486e890d5d7dd9b5f2bdf8e4519cb4c9e992df2d (diff)
downloadorg.eclipse.jetty.project-c8ec399af24708ed4888a67af2e9b97edc7b110d.tar.gz
org.eclipse.jetty.project-c8ec399af24708ed4888a67af2e9b97edc7b110d.tar.xz
org.eclipse.jetty.project-c8ec399af24708ed4888a67af2e9b97edc7b110d.zip
Merge branch 'jetty-9.2.x' into jetty-9.3.x
-rw-r--r--jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java10
1 files changed, 4 insertions, 6 deletions
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 198e5c4c25..20fc7db1ea 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
@@ -345,14 +345,12 @@ public class ShutdownMonitor
*/
private ShutdownMonitor()
{
- Properties props = System.getProperties();
-
- this.DEBUG = props.containsKey("DEBUG");
+ this.DEBUG = System.getProperty("DEBUG") != null;
// Use values passed thru via /jetty-start/
- this.host = props.getProperty("STOP.HOST","127.0.0.1");
- this.port = Integer.parseInt(props.getProperty("STOP.PORT","-1"));
- this.key = props.getProperty("STOP.KEY",null);
+ this.host = System.getProperty("STOP.HOST","127.0.0.1");
+ this.port = Integer.parseInt(System.getProperty("STOP.PORT","-1"));
+ this.key = System.getProperty("STOP.KEY",null);
this.exitVm = true;
}

Back to the top