Switched around call for connect/closing latches

marci4 · marci4 · commit 43c8b1479208 · 2017-04-15T23:06:54.000+02:00
Fix for: Client blocking connect and close methods return too soon TooTallNate#302
diff --git a/src/main/java/org/java_websocket/client/WebSocketClient.java b/src/main/java/org/java_websocket/client/WebSocketClient.java
@@ -271,17 +271,15 @@ public void onWebsocketMessageFragment( WebSocket conn, Framedata frame ) {
 	 */
 	@Override
 	public final void onWebsocketOpen( WebSocket conn, Handshakedata handshake ) {
-		connectLatch.countDown();
 		onOpen( (ServerHandshake) handshake );
+		connectLatch.countDown();
 	}
 
 	/**
 	 * Calls subclass' implementation of <var>onClose</var>.
 	 */
 	@Override
 	public final void onWebsocketClose( WebSocket conn, int code, String reason, boolean remote ) {
-		connectLatch.countDown();
-		closeLatch.countDown();
 		if( writeThread != null )
 			writeThread.interrupt();
 		try {
@@ -291,6 +289,8 @@ public final void onWebsocketClose( WebSocket conn, int code, String reason, boo
 			onWebsocketError( this, e );
 		}
 		onClose( code, reason, remote );
+		connectLatch.countDown();
+		closeLatch.countDown();
 	}
 
 	/**
