#311554 Protect shutdown thread from Server#doStop

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1722 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-05 13:06:45 +00:00 · 2010-05-05 13:06:45 +00:00 · 6337796369
parent d41459934c
commit 6337796369
2 changed files with 4 additions and 1 deletions
--- a/VERSION.txt
+++ b/VERSION.txt
@ -1,5 +1,6 @@

 + 311154 Added deprecated StringBuffer API for backwards compatibility
+ + 311554 Protect shutdown thread from Server#doStop

 jetty-7.1.0.RC1-SNAPSHOT
 + 286889 Allow System and Server classes to be set on Server instance and when applied to all webapps
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
@ -308,7 +308,9 @@ public class Server extends HandlerWrapper implements Attributes
        }
       
        mex.ifExceptionThrow();
-        ShutdownThread.deregister(this);
+
+        if (getStopAtShutdown())
+            ShutdownThread.deregister(this);
    }

    /* ------------------------------------------------------------ */