Merge pull request TooTallNate#159 from MorganWu/master

Davidiusdadi · Davidiusdadi · commit f5791ec2c012 · 2013-02-26T03:16:53.000-08:00
fix NullPointerException in WebSocketClient
diff --git a/src/main/java/org/java_websocket/client/WebSocketClient.java b/src/main/java/org/java_websocket/client/WebSocketClient.java
@@ -120,7 +120,11 @@ public WebSocketClient( URI serverUri , Draft draft , Map<String,String> headers
 			conn = (WebSocketImpl) wf.createWebSocket( this, draft, channel.socket() );
 		} catch ( IOException e ) {
 			onWebsocketError( null, e );
-			conn.closeConnection( CloseFrame.NEVER_CONNECTED, e.getMessage() );
+			
+			if(conn != null) {
+				conn.closeConnection( CloseFrame.NEVER_CONNECTED, e.getMessage() );
+			}
+			
 			return;
 		}
 	}
@@ -223,7 +227,11 @@ private final void interruptableRun() {
 			return;
 		} catch ( /*IOException | SecurityException | UnresolvedAddressException*/Exception e ) {//
 			onWebsocketError( conn, e );
-			conn.closeConnection( CloseFrame.NEVER_CONNECTED, e.getMessage() );
+			
+			if(conn != null) {
+				conn.closeConnection( CloseFrame.NEVER_CONNECTED, e.getMessage() );
+			}
+			
 			return;
 		}
 
