quickfix for TooTallNate#168

Davidiusdadi · Davidiusdadi · commit 5d4deaddf444 · 2013-04-03T01:14:25.000+02:00
diff --git a/src/main/java/org/java_websocket/WebSocketImpl.java b/src/main/java/org/java_websocket/WebSocketImpl.java
@@ -465,7 +465,7 @@ protected synchronized void closeConnection( int code, String message, boolean r
 		handshakerequest = null;
 
 		readystate = READYSTATE.CLOSED;
-
+		this.outQueue.clear();
 	}
 
 	protected void closeConnection( int code, boolean remote ) {
diff --git a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/main/java/org/java_websocket/server/WebSocketServer.java
@@ -529,7 +529,12 @@ public final void onWebsocketError( WebSocket conn, Exception ex ) {
 	@Override
 	public final void onWriteDemand( WebSocket w ) {
 		WebSocketImpl conn = (WebSocketImpl) w;
-		conn.key.interestOps( SelectionKey.OP_READ | SelectionKey.OP_WRITE );
+		try {
+			conn.key.interestOps( SelectionKey.OP_READ | SelectionKey.OP_WRITE );
+		} catch ( CancelledKeyException e ) {
+			// the thread which cancels key is responsible for possible cleanup
+			conn.outQueue.clear();
+		}
 		selector.wakeup();
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,7 @@ protected synchronized void closeConnection( int code, String message, boolean r`
`465`	`465`	`handshakerequest = null;`
`466`	`466`
`467`	`467`	`readystate = READYSTATE.CLOSED;`
`468`		`-`
	`468`	`+ this.outQueue.clear();`
`469`	`469`	`}`
`470`	`470`
`471`	`471`	`protected void closeConnection( int code, boolean remote ) {`