Ensure the socket is not null when attempting to close it.

Cameron Auser · Cameron Auser · commit d8eb0f8b9829 · 2024-02-21T09:17:50.000-06:00
diff --git a/src/main/java/org/java_websocket/client/WebSocketClient.java b/src/main/java/org/java_websocket/client/WebSocketClient.java
@@ -339,7 +339,9 @@ private void reset() {
           "You cannot initialize a reconnect out of the websocket thread. Use reconnect in another thread to ensure a successful cleanup.");
     }
     try {
-      if (engine.getReadyState() == ReadyState.NOT_YET_CONNECTED) {
+      // This socket null check ensures we can reconnect a socket that failed to connect. It's an uncommon edge case, but we want to make sure we support it
+      if (engine.getReadyState() == ReadyState.NOT_YET_CONNECTED && socket != null) {
+        // Closing the socket when we have not connected prevents the writeThread from hanging on a write indefinitely during connection teardown
         socket.close();
       }
       closeBlocking();

Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,9 @@ private void reset() {`
`339`	`339`	`"You cannot initialize a reconnect out of the websocket thread. Use reconnect in another thread to ensure a successful cleanup.");`
`340`	`340`	`}`
`341`	`341`	`try {`
`342`		`- if (engine.getReadyState() == ReadyState.NOT_YET_CONNECTED) {`
	`342`	`+ // This socket null check ensures we can reconnect a socket that failed to connect. It's an uncommon edge case, but we want to make sure we support it`
	`343`	`+ if (engine.getReadyState() == ReadyState.NOT_YET_CONNECTED && socket != null) {`
	`344`	`+ // Closing the socket when we have not connected prevents the writeThread from hanging on a write indefinitely during connection teardown`
`343`	`345`	`socket.close();`
`344`	`346`	`}`
`345`	`347`	`closeBlocking();`