Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2015-11-05 12:33:25 -0500
committerJoakim Erdfelt2015-11-05 12:33:25 -0500
commit486e890d5d7dd9b5f2bdf8e4519cb4c9e992df2d (patch)
treecc83c2d82838c5b21c02241ef2abe1ce2dcd3a04
parentb4cf2921c8ff324f8b60b5c0867fef202cbf6040 (diff)
downloadorg.eclipse.jetty.project-486e890d5d7dd9b5f2bdf8e4519cb4c9e992df2d.tar.gz
org.eclipse.jetty.project-486e890d5d7dd9b5f2bdf8e4519cb4c9e992df2d.tar.xz
org.eclipse.jetty.project-486e890d5d7dd9b5f2bdf8e4519cb4c9e992df2d.zip
481236 - Make ShutdownMonitor java security manager friendly
+ Limit access to specific System properties
-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 3b71a745ca..183937ac6e 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