Fix bug TooTallNate#373. (TooTallNate#374)

felixvf · marci4 · commit dd4323d3fda3 · 2017-03-15T17:21:45.000+01:00
Deadlock due to race condition in WebSocketServer.stop
diff --git a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/main/java/org/java_websocket/server/WebSocketServer.java
@@ -219,8 +219,8 @@ public void stop( int timeout ) throws InterruptedException {
 
 		synchronized ( this ) {
 			if( selectorthread != null && selectorthread != Thread.currentThread() ) {
-				selector.wakeup();
 				selectorthread.interrupt();
+				selector.wakeup();
 				selectorthread.join( timeout );
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -219,8 +219,8 @@ public void stop( int timeout ) throws InterruptedException {`
`219`	`219`
`220`	`220`	`synchronized ( this ) {`
`221`	`221`	`if( selectorthread != null && selectorthread != Thread.currentThread() ) {`
`222`		`- selector.wakeup();`
`223`	`222`	`selectorthread.interrupt();`
	`223`	`+ selector.wakeup();`
`224`	`224`	`selectorthread.join( timeout );`
`225`	`225`	`}`
`226`	`226`	`}`