using SelectionKeys.interestOps instead of unnecessarily bothering the selector

Davidiusdadi · Davidiusdadi · commit aa8ed15e5cec · 2012-08-18T02:11:45.000+02:00
diff --git a/src/org/java_websocket/WebSocketImpl.java b/src/org/java_websocket/WebSocketImpl.java
@@ -13,7 +13,6 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.drafts.Draft;
 import org.java_websocket.drafts.Draft.CloseHandshakeType;
 import org.java_websocket.drafts.Draft.HandshakeState;
@@ -34,7 +33,6 @@
 import org.java_websocket.handshake.Handshakedata;
 import org.java_websocket.handshake.ServerHandshake;
 import org.java_websocket.handshake.ServerHandshakeBuilder;
-import org.java_websocket.server.WebSocketServer;
 import org.java_websocket.server.WebSocketServer.WebSocketWorker;
 import org.java_websocket.util.Charsetfunctions;
 
@@ -106,20 +104,9 @@ public class WebSocketImpl extends WebSocket {
 	/** stores the handshake sent by this websocket ( Role.CLIENT only ) */
 	private ClientHandshake handshakerequest = null;
 
-
-	// CONSTRUCTOR /////////////////////////////////////////////////////////////
 	/**
-	 * Used in {@link WebSocketServer} and {@link WebSocketClient}.
-	 * 
-	 * @param socketchannel
-	 *            The <tt>SocketChannel</tt> instance to read and
-	 *            write to. The channel should already be registered
-	 *            with a Selector before construction of this object.
-	 * @param listener
-	 *            The {@link WebSocketListener} to notify of events when
-	 *            they occur.
+	 * crates a websocket with server role
 	 */
-
 	public WebSocketImpl( WebSocketListener listener , List<Draft> drafts , Socket sock ) {
 		this( listener, (Draft) null, sock );
 		this.role = Role.SERVER;
@@ -134,6 +121,9 @@ public WebSocketImpl( WebSocketListener listener , List<Draft> drafts , Socket s
 		}
 	}
 
+	/**
+	 * crates a websocket with client role
+	 */
 	public WebSocketImpl( WebSocketListener listener , Draft draft , Socket sock ) {
 		this.outQueue = new LinkedBlockingQueue<ByteBuffer>();
 		inQueue = new LinkedBlockingQueue<ByteBuffer>();
diff --git a/src/org/java_websocket/server/WebSocketServer.java b/src/org/java_websocket/server/WebSocketServer.java
@@ -8,7 +8,6 @@
 import java.nio.ByteBuffer;
 import java.nio.channels.ByteChannel;
 import java.nio.channels.CancelledKeyException;
-import java.nio.channels.ClosedChannelException;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
 import java.nio.channels.ServerSocketChannel;
@@ -347,17 +346,11 @@ private void pushBuffer( ByteBuffer buf ) throws InterruptedException {
 		buffers.put( buf );
 	}
 
-	private void registerWrite() {
+	private void registerWrite() throws CancelledKeyException {
 		int size = oqueue.size();
 		for( int i = 0 ; i < size ; i++ ) {
 			WebSocketImpl conn = oqueue.remove();
-			try {
-				conn.key.channel().register( selector, SelectionKey.OP_READ | SelectionKey.OP_WRITE, conn );
-			} catch ( ClosedChannelException ex ) {
-				onWebsocketError( null, ex );
-				conn.eot( null );
-				return;
-			}
+			conn.key.interestOps( SelectionKey.OP_READ | SelectionKey.OP_WRITE );
 		}
 	}
 
