made WebSocketServer::stop also terminate its worker threads & a few minor changes (TooTallNate#129)

Davidiusdadi · Davidiusdadi · commit 0b4964f93dd7 · 2012-10-28T21:39:11.000+01:00
diff --git a/src/main/java/org/java_websocket/client/WebSocketClient.java b/src/main/java/org/java_websocket/client/WebSocketClient.java
@@ -140,8 +140,15 @@ public void connect() {
 	}
 
 	public void close() {
-		if( thread != null && conn != null ) {
+		if( thread != null ) {
 			conn.close( CloseFrame.NORMAL );
+			/*closelock.lock();
+			try {
+				if( selector != null )
+					selector.wakeup();
+			} finally {
+				closelock.unlock();
+			}*/
 		}
 
 	}
@@ -383,7 +390,7 @@ public final void onWriteDemand( WebSocket conn ) {
 			key.interestOps( SelectionKey.OP_READ | SelectionKey.OP_WRITE );
 			selector.wakeup();
 		} catch ( CancelledKeyException e ) {
-			// since such an exception/event will also occur on the selector there is no need to do anything herec
+			// since such an exception/event will also occur on the selector there is no need to do anything here
 		}
 	}
 
diff --git a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/main/java/org/java_websocket/server/WebSocketServer.java
@@ -161,8 +161,8 @@ public WebSocketServer( InetSocketAddress address , int decodercount , List<Draf
 	 */
 	public void start() {
 		if( selectorthread != null )
-			throw new IllegalStateException( "Already started" );
-		new Thread( this ).start();
+			throw new IllegalStateException( getClass().getName() + " can only be started once." );
+		new Thread( this ).start();;
 	}
 
 	/**
@@ -171,15 +171,20 @@ public void start() {
 	 * freeing the port the server was bound to.
 	 * 
 	 * @throws IOException
-	 *             When socket related I/O errors occur.
+	 *             When {@link ServerSocketChannel}.close throws an IOException
+	 * @throws InterruptedException
 	 */
-	public void stop() throws IOException {
+	public void stop() throws IOException , InterruptedException {
 		synchronized ( connections ) {
 			for( WebSocket ws : connections ) {
 				ws.close( CloseFrame.NORMAL );
 			}
 		}
 		selectorthread.interrupt();
+		selectorthread.join();
+		for( WebSocketWorker w : decoders ) {
+			w.interrupt();
+		}
 		this.server.close();
 
 	}
@@ -228,9 +233,11 @@ public List<Draft> getDraft() {
 
 	// Runnable IMPLEMENTATION /////////////////////////////////////////////////
 	public void run() {
-		if( selectorthread != null )
-			throw new IllegalStateException( "This instance of " + getClass().getSimpleName() + " can only be started once the same time." );
-		selectorthread = Thread.currentThread();
+		synchronized ( this ) {
+			if( selectorthread != null )
+				throw new IllegalStateException( getClass().getName() + " can only be started once." );
+			selectorthread = Thread.currentThread();
+		}
 		selectorthread.setName( "WebsocketSelector" + selectorthread.getId() );
 		try {
 			server = ServerSocketChannel.open();
@@ -388,12 +395,11 @@ private void handleIOException( WebSocket conn, IOException ex ) {
 	private void handleFatal( WebSocket conn, RuntimeException e ) {
 		onError( conn, e );
 		try {
-			selector.close();
+			stop();
 		} catch ( IOException e1 ) {
 			onError( null, e1 );
-		}
-		for( WebSocketWorker w : decoders ) {
-			w.interrupt();
+		} catch ( InterruptedException e1 ) {
+			onError( null, e1 );
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -140,8 +140,15 @@ public void connect() {`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`public void close() {`
`143`		`- if( thread != null && conn != null ) {`
	`143`	`+ if( thread != null ) {`
`144`	`144`	`conn.close( CloseFrame.NORMAL );`
	`145`	`+ /*closelock.lock();`
	`146`	`+ try {`
	`147`	`+ if( selector != null )`
	`148`	`+ selector.wakeup();`
	`149`	`+ } finally {`
	`150`	`+ closelock.unlock();`
	`151`	`+ }*/`
`145`	`152`	`}`
`146`	`153`
`147`	`154`	`}`
`@@ -383,7 +390,7 @@ public final void onWriteDemand( WebSocket conn ) {`
`383`	`390`	`key.interestOps( SelectionKey.OP_READ \| SelectionKey.OP_WRITE );`
`384`	`391`	`selector.wakeup();`
`385`	`392`	`} catch ( CancelledKeyException e ) {`
`386`		`- // since such an exception/event will also occur on the selector there is no need to do anything herec`
	`393`	`+ // since such an exception/event will also occur on the selector there is no need to do anything here`
`387`	`394`	`}`
`388`	`395`	`}`
`389`	`396`