tweaked WebsocketServer.stop to perform a graceful shutdown

Author: Davidiusdadi

src/main/java/org/java_websocket/server/WebSocketServer.java

@@ -195,13 +195,13 @@ public void start(){
  * If this method is called before the server is started it will never start.
  * 
  * @param timeout
- * Specifies how many milliseconds shall pass between initiating the close handshakes with the connected clients and closing the servers socket channel.
+ * Specifies how many milliseconds the overall close handshaking may take altogether before the connections are closed without proper close handshaking.<br>
  * 
  * @throws IOException
  * When{@link ServerSocketChannel}.close throws an IOException
  * @throws InterruptedException
  */
-publicvoidstop( inttimeout ) throwsIOException , InterruptedException{
+publicvoidstop( inttimeout ) throwsInterruptedException{
 if( !isclosed.compareAndSet( false, true ) ){// this also makes sure that no further connections will be added to this.connections
 return;
  }
@@ -223,21 +223,14 @@ public void stop( int timeout ) throws IOException , InterruptedException{
 
  }
 if( selectorthread != Thread.currentThread() ){
-selectorthread.interrupt();
+if( socketsToClose.size() > 0 )
+selectorthread.join( timeout );// isclosed will tell the selectorthread to go down after the last connection was closed
+selectorthread.interrupt();// in case the selectorthread did not terminate in time we send the interrupt
 selectorthread.join();
  }
  }
-if( decoders != null ){
-for( WebSocketWorkerw : decoders ){
-w.interrupt();
- }
- }
-if( server != null ){
-server.close();
- }
  }
  }
-
 publicvoidstop() throwsIOException , InterruptedException{
 stop( 0 );
  }
@@ -397,6 +390,19 @@ public void run(){
  } catch ( RuntimeExceptione ){
 // should hopefully never occur
 handleFatal( null, e );
+ } finally{
+if( decoders != null ){
+for( WebSocketWorkerw : decoders ){
+w.interrupt();
+ }
+ }
+if( server != null ){
+try{
+server.close();
+ } catch ( IOExceptione ){
+onError( null, e );
+ }
+ }
  }
  }
 protectedvoidallocateBuffers( WebSocketc ) throwsInterruptedException{
@@ -528,19 +534,24 @@ public final void onWebsocketClose( WebSocket conn, int code, String reason, boo
  * Depending on the type on the connection, modifications of that collection may have to be synchronized.
  **/
 protectedbooleanremoveConnection( WebSocketws ){
+booleanremoved;
 synchronized ( connections ){
-returnthis.connections.remove( ws );
+removed = this.connections.remove( ws );
+assert ( removed );
  }
+if( isclosed.get() && connections.size() == 0 ){
+selectorthread.interrupt();
+ }
+returnremoved;
  }
-
 @Override
 publicServerHandshakeBuilderonWebsocketHandshakeReceivedAsServer( WebSocketconn, Draftdraft, ClientHandshakerequest ) throwsInvalidDataException{
 returnsuper.onWebsocketHandshakeReceivedAsServer( conn, draft, request );
  }
 
 /** @see #removeConnection(WebSocket) */
 protectedbooleanaddConnection( WebSocketws ){
-if( isclosed.get() ){
+if( !isclosed.get() ){
 synchronized ( connections ){
 booleansucc = this.connections.add( ws );
 assert ( succ );