fixed TooTallNate#128: Crash on socket close if disconnected/not yet connected

Davidiusdadi · Davidiusdadi · commit 5c453efd5f45 · 2012-10-28T03:21:43.000+01:00
diff --git a/src/main/java/org/java_websocket/client/WebSocketClient.java b/src/main/java/org/java_websocket/client/WebSocketClient.java
@@ -140,15 +140,8 @@ public void connect() {
 	}
 
 	public void close() {
-		if( thread != null ) {
+		if( thread != null && conn != null ) {
 			conn.close( CloseFrame.NORMAL );
-			/*closelock.lock();
-			try {
-				if( selector != null )
-					selector.wakeup();
-			} finally {
-				closelock.unlock();
-			}*/
 		}
 
 	}
@@ -390,7 +383,7 @@ public final void onWriteDemand( WebSocket conn ) {
 			key.interestOps( SelectionKey.OP_READ | SelectionKey.OP_WRITE );
 			selector.wakeup();
 		} catch ( CancelledKeyException e ) {
-			// since such an exception/event will also occur on the selector there is no need to do anything here
+			// since such an exception/event will also occur on the selector there is no need to do anything herec
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -140,15 +140,8 @@ public void connect() {`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`public void close() {`
`143`		`- if( thread != null ) {`
	`143`	`+ if( thread != null && conn != null ) {`
`144`	`144`	`conn.close( CloseFrame.NORMAL );`
`145`		`- /*closelock.lock();`
`146`		`- try {`
`147`		`- if( selector != null )`
`148`		`- selector.wakeup();`
`149`		`- } finally {`
`150`		`- closelock.unlock();`
`151`		`- }*/`
`152`	`145`	`}`
`153`	`146`
`154`	`147`	`}`
`@@ -390,7 +383,7 @@ public final void onWriteDemand( WebSocket conn ) {`
`390`	`383`	`key.interestOps( SelectionKey.OP_READ \| SelectionKey.OP_WRITE );`
`391`	`384`	`selector.wakeup();`
`392`	`385`	`} catch ( CancelledKeyException e ) {`
`393`		`- // since such an exception/event will also occur on the selector there is no need to do anything here`
	`386`	`+ // since such an exception/event will also occur on the selector there is no need to do anything herec`
`394`	`387`	`}`
`395`	`388`	`}`
`396`	`389`