Merge branch 'master' of github.com:TooTallNate/Java-WebSocket

Davidiusdadi · Davidiusdadi · commit b6039aae529a · 2012-08-22T08:54:48.000+02:00
diff --git a/src/org/java_websocket/client/WebSocketClient.java b/src/org/java_websocket/client/WebSocketClient.java
@@ -192,7 +192,8 @@ public void run() {
 		interruptableRun();
 
 		try {
-			selector.close();
+			if (selector != null) // if the initialization in <code>tryToConnect</code> fails, it could be null
+				selector.close();
 		} catch ( IOException e ) {
 			onError( e );
 		}

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,8 @@ public void run() {`
`192`	`192`	`interruptableRun();`
`193`	`193`
`194`	`194`	`try {`
`195`		`- selector.close();`
	`195`	`+ if (selector != null) // if the initialization in <code>tryToConnect</code> fails, it could be null`
	`196`	`+ selector.close();`
`196`	`197`	`} catch ( IOException e ) {`
`197`	`198`	`onError( e );`
`198`	`199`	`}`