Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-7' into jetty-8

This commit is contained in:
Jan Bartel 2013-03-15 14:40:19 +11:00
parent 8a96cc8c4a 41feea7e01
commit b15f9340d0
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
View File

@ -262,10 +262,12 @@ public class Server extends HandlerWrapper implements Attributes
@Override @Override
protected void doStart() throws Exception protected void doStart() throws Exception
{ {
if (getStopAtShutdown()) { if (getStopAtShutdown())
ShutdownThread.register(this); {
ShutdownMonitor.getInstance().start(); // initialize ShutdownThread.register(this);
} }
ShutdownMonitor.getInstance().start(); // initialize
LOG.info("jetty-"+__version); LOG.info("jetty-"+__version);
HttpGenerator.setServerVersion(__version); HttpGenerator.setServerVersion(__version);

2
jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java
View File

@ -75,7 +75,7 @@ public class ShutdownMonitor extends Thread
// Use values passed thru via /jetty-start/ // Use values passed thru via /jetty-start/
this.port = Integer.parseInt(props.getProperty("STOP.PORT","-1")); 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; this.exitVm = true;
} }