ws client fix

DanielYWoo · DanielYWoo · commit 710eefde0188 · 2012-08-15T14:14:16.000+08:00
diff --git a/src/org/java_websocket/client/WebSocketClient.java b/src/org/java_websocket/client/WebSocketClient.java
@@ -5,12 +5,7 @@
 import java.net.Socket;
 import java.net.URI;
 import java.nio.ByteBuffer;
-import java.nio.channels.ClosedByInterruptException;
-import java.nio.channels.NotYetConnectedException;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.SocketChannel;
-import java.nio.channels.UnresolvedAddressException;
+import java.nio.channels.*;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -257,6 +252,10 @@ private final void interruptableRun() {
 		} catch ( IOException e ) {
 			onError( e );
 			conn.close( CloseFrame.ABNORMAL_CLOSE );
+        } catch ( CancelledKeyException e ) {
+            // remote peer closed the channel abnormally, probably caused by server crash or network issue
+            onError( e );
+            conn.close( CloseFrame.ABNORMAL_CLOSE );
 		} catch ( RuntimeException e ) {
 			// this catch case covers internal errors only and indicates a bug in this websocket implementation
 			onError( e );
@@ -312,6 +311,9 @@ private void sendHandshake() throws IOException , InvalidHandshakeException , In
 	 * @return Returns '0 = CONNECTING', '1 = OPEN', '2 = CLOSING' or '3 = CLOSED'
 	 */
 	public int getReadyState() {
+        if (conn == null) {
+            return WebSocket.READY_STATE_CONNECTING;
+        }
 		return conn.getReadyState();
 	}
 
