Merge pull request adamfisk#179 from jekh/remove-shutdown-hook-on-stop

Remove JVM shutdown hook on stop()

src/main/java/org/littleshoot/proxy/impl/DefaultHttpProxyServer.java

@@ -488,6 +488,17 @@ private static class ServerGroup {
 
         private volatile boolean stopped = false;
 
+        /**
+         * JVM shutdown hook to stop this server group. Declared as a class-level variable to allow removing the shutdown hook when the
+         * server is stopped normally.
+         */
+        private final Thread serverGroupShutdownHook = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                stop();
+            }
+        });
+
         private ServerGroup(String name) {
             this.name = name;
 
@@ -497,11 +508,7 @@ public void uncaughtException(final Thread t, final Throwable e) {
                 }
             });
 
-            Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
-                public void run() {
-                    stop();
-                }
-            }));
+            Runtime.getRuntime().addShutdownHook(serverGroupShutdownHook);
         }
 
         public synchronized void ensureProtocol(
@@ -588,6 +595,9 @@ synchronized private void stop() {
                 }
             }
 
+            // remove the shutdown hook that was added when the server group was started, since it has now been stopped
+            Runtime.getRuntime().removeShutdownHook(serverGroupShutdownHook);
+
             stopped = true;
 
             LOG.info("Done shutting down proxy");