fix for TooTallNate#119

Davidiusdadi · Davidiusdadi · commit f0ce0d98f6e6 · 2012-09-20T02:15:53.000+02:00
diff --git a/src/org/java_websocket/client/WebSocketClient.java b/src/org/java_websocket/client/WebSocketClient.java
@@ -6,6 +6,7 @@
 import java.net.URI;
 import java.nio.ByteBuffer;
 import java.nio.channels.ByteChannel;
+import java.nio.channels.CancelledKeyException;
 import java.nio.channels.ClosedByInterruptException;
 import java.nio.channels.NotYetConnectedException;
 import java.nio.channels.SelectionKey;
@@ -16,8 +17,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 
 import org.java_websocket.SocketChannelIOHelper;
 import org.java_websocket.WebSocket;
@@ -68,8 +67,6 @@ public abstract class WebSocketClient extends WebSocketAdapter implements Runnab
 
 	private Draft draft;
 
-	private final Lock closelock = new ReentrantLock();
-
 	private Map<String,String> headers;
 
 	WebSocketClientFactory wf = new WebSocketClientFactory() {
@@ -142,14 +139,14 @@ public void connect() {
 
 	public void close() {
 		if( thread != null ) {
-			thread.interrupt();
-			closelock.lock();
+			conn.close( CloseFrame.NORMAL );
+			/*closelock.lock();
 			try {
 				if( selector != null )
 					selector.wakeup();
 			} finally {
 				closelock.unlock();
-			}
+			}*/
 		}
 
 	}
@@ -191,23 +188,16 @@ public void run() {
 		if( thread == null )
 			thread = Thread.currentThread();
 		interruptableRun();
+		
+		assert ( !channel.isOpen() );
 
 		try {
 			if( selector != null ) // if the initialization in <code>tryToConnect</code> fails, it could be null
 				selector.close();
 		} catch ( IOException e ) {
 			onError( e );
 		}
-		closelock.lock();
-		selector = null;
-		closelock.unlock();
-		try {
-			channel.close();
-		} catch ( IOException e ) {
-			onError( e );
-		}
-		channel = null;
-		thread = null;
+
 	}
 
 	private final void interruptableRun() {
@@ -230,9 +220,6 @@ private final void interruptableRun() {
 		ByteBuffer buff = ByteBuffer.allocate( WebSocket.RCVBUF );
 		try/*IO*/{
 			while ( channel.isOpen() ) {
-				if( Thread.interrupted() ) {
-					conn.close( CloseFrame.NORMAL );
-				}
 				SelectionKey key = null;
 				selector.select();
 				Set<SelectionKey> keys = selector.selectedKeys();
@@ -271,6 +258,8 @@ private final void interruptableRun() {
 					}
 				}
 			}
+
+		} catch ( CancelledKeyException e ) {
 		} catch ( IOException e ) {
 			onError( e );
 			conn.close( CloseFrame.ABNORMAL_CLOSE );
@@ -303,9 +292,9 @@ private void finishConnect( SelectionKey key ) throws IOException , InvalidHands
 			channel.finishConnect();
 		}
 		// Now that we're connected, re-register for only 'READ' keys.
-		key.interestOps( SelectionKey.OP_READ | SelectionKey.OP_WRITE );
+		conn.key = key.interestOps( SelectionKey.OP_READ | SelectionKey.OP_WRITE );
 
-		wrappedchannel = wf.wrapChannel( key, uri.getHost(), getPort() );
+		conn.channel = wrappedchannel = wf.wrapChannel( key, uri.getHost(), getPort() );
 		sendHandshake();
 	}
 
