Gracefull shutdown on stop()

marci4 · marci4 · commit 069e01b9030f · 2017-11-30T20:15:23.000+01:00
This should solve the issue TooTallNate#620
diff --git a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/main/java/org/java_websocket/server/WebSocketServer.java
@@ -253,8 +253,7 @@ public void stop( int timeout ) throws InterruptedException {
 		wsf.close();
 
 		synchronized ( this ) {
-			if( selectorthread != null && selectorthread != Thread.currentThread() ) {
-				selectorthread.interrupt();
+			if( selectorthread != null  ) {
 				selector.wakeup();
 				selectorthread.join( timeout );
 			}
@@ -329,11 +328,19 @@ public void run() {
 			return;
 		}
 		try {
-			while ( !selectorthread.isInterrupted() ) {
+			int iShutdownCount = 5;
+			int selectTimeout = 0;
+			while ( !selectorthread.isInterrupted() && iShutdownCount != 0) {
 				SelectionKey key = null;
 				WebSocketImpl conn = null;
 				try {
-					selector.select();
+					if (isclosed.get()) {
+						selectTimeout = 5;
+					}
+					int keyCount = selector.select( selectTimeout );
+					if (keyCount == 0 && isclosed.get()) {
+						iShutdownCount--;
+					}
 					Set<SelectionKey> keys = selector.selectedKeys();
 					Iterator<SelectionKey> i = keys.iterator();
 
