fixed two nullpointer bugs

Davidiusdadi · Davidiusdadi · commit b20ddca80a89 · 2012-01-18T23:26:56.000+01:00
diff --git a/src/net/tootallnate/websocket/WebSocketClient.java b/src/net/tootallnate/websocket/WebSocketClient.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.URI;
+import java.nio.channels.ClosedByInterruptException;
 import java.nio.channels.NotYetConnectedException;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
@@ -132,7 +133,11 @@ private void tryToConnect( InetSocketAddress remote ) throws IOException {
 	public void run() {
 		try {
 			tryToConnect( new InetSocketAddress( uri.getHost(), getPort() ) );
-		} catch ( IOException e ) {//
+		} 
+		catch (ClosedByInterruptException e) {
+			onError( null, e );
+			return;
+		}catch ( IOException e ) {//
 			onError( conn, e );
 			conn.close();
 			return;
@@ -156,6 +161,9 @@ public void run() {
 					if( key.isReadable() ) {
 						conn.handleRead();
 					}
+					if(!key.isValid()){
+						continue;
+					}
 					if( key.isWritable() ) {
 						conn.handleWrite();
 					}
