Merged branch 'master' of https://github.com/DanielYWoo/Java-WebSocket

Davidiusdadi · Davidiusdadi · commit aeb04e5d970b · 2012-08-17T00:42:08.000+02:00
diff --git a/src/org/java_websocket/client/WebSocketClient.java b/src/org/java_websocket/client/WebSocketClient.java
@@ -260,7 +260,7 @@ private final void interruptableRun() {
 		} catch ( IOException e ) {
 			onError( e );
 			conn.close( CloseFrame.ABNORMAL_CLOSE );
-		} catch ( RuntimeException e ) {
+        } catch ( RuntimeException e ) {
 			// this catch case covers internal errors only and indicates a bug in this websocket implementation
 			onError( e );
 			conn.eot( e );
@@ -315,6 +315,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();
 	}
 
