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

2013-03-02 10:29:15 +11:00 · 2013-03-02 10:29:15 +11:00 · afbf98bd88
parent 7c442735c0 095e66db33
commit afbf98bd88
1 changed files with 3 additions and 1 deletions
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java
@ -157,7 +157,7 @@ public class ShutdownMonitor extends Thread
            return;
        }

-        while (true)
+        while (serverSocket != null)
        {
            Socket socket = null;
            try
@ -190,7 +190,9 @@ public class ShutdownMonitor extends Thread
                    // Shutdown Monitor
                    debug("Shutting down monitor");
                    close(socket);
+                    socket = null;
                    close(serverSocket);
+                    serverSocket = null;

                    if (exitVm)
                    {