caught uncaught exception

Davidiusdadi · Davidiusdadi · commit 05fb852f6b3d · 2012-04-14T23:40:53.000+02:00
diff --git a/src/org/java_websocket/WebSocketServer.java b/src/org/java_websocket/WebSocketServer.java
@@ -5,6 +5,7 @@
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
+import java.nio.channels.CancelledKeyException;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
 import java.nio.channels.ServerSocketChannel;
@@ -212,6 +213,8 @@ public void run() {
 							}
 						}
 					}
+				} catch ( CancelledKeyException e ) {
+					// an other thread may cancel the key
 				} catch ( IOException ex ) {
 					if( key != null )
 						key.cancel();

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`import java.net.InetSocketAddress;`
`6`	`6`	`import java.net.UnknownHostException;`
`7`	`7`	`import java.nio.ByteBuffer;`
	`8`	`+import java.nio.channels.CancelledKeyException;`
`8`	`9`	`import java.nio.channels.SelectionKey;`
`9`	`10`	`import java.nio.channels.Selector;`
`10`	`11`	`import java.nio.channels.ServerSocketChannel;`
`@@ -212,6 +213,8 @@ public void run() {`
`212`	`213`	`}`
`213`	`214`	`}`
`214`	`215`	`}`
	`216`	`+ } catch ( CancelledKeyException e ) {`
	`217`	`+ // an other thread may cancel the key`
`215`	`218`	`} catch ( IOException ex ) {`
`216`	`219`	`if( key != null )`
`217`	`220`	`key.cancel();`