Merge pull request #2 from balihoo/11417-KillThreadOnClientDisconnect

cleankill: added interrupting client listener
closure-gun · Jul 13, 2015 · f9adcc3 · f9adcc3
2 parents 5c33d6e + 2860161
commit f9adcc3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/nailgun-server/src/main/java/com/martiansoftware/nailgun/NGClientListener.java b/nailgun-server/src/main/java/com/martiansoftware/nailgun/NGClientListener.java
@@ -8,4 +8,10 @@ public interface NGClientListener {
      * clientDisconnected throws an InterruptedException nailgun interrupts the main session thread.
      */
     public void clientDisconnected() throws InterruptedException;
+
+    public final class Interrupter implements  NGClientListener {
+        public void clientDisconnected() throws InterruptedException {
+            throw new InterruptedException();
+        }
+    }
 }
diff --git a/nailgun-server/src/main/java/com/martiansoftware/nailgun/NGSession.java b/nailgun-server/src/main/java/com/martiansoftware/nailgun/NGSession.java
@@ -255,7 +255,10 @@ public void run() {
                 PrintStream exit = null;
 
                 try {
-                    in = new NGInputStream(sockin, sockout, server.out, heartbeatTimeoutMillis);
+                    NGInputStream ngin = new NGInputStream(sockin, sockout, server.out, heartbeatTimeoutMillis);
+                    ngin.addClientListener(new NGClientListener.Interrupter());
+
+                    in = ngin;
                     out = new PrintStream(new NGOutputStream(sockout, NGConstants.CHUNKTYPE_STDOUT));
                     err = new PrintStream(new NGOutputStream(sockout, NGConstants.CHUNKTYPE_STDERR));
                     exit = new PrintStream(new NGOutputStream(sockout, NGConstants.CHUNKTYPE_EXIT));