Improve onClose behaviour on client side

marci4 · marci4 · commit 4057d17ea110 · 2017-10-19T21:44:06.000+02:00
TooTallNate#577 Client will delay closing the socket until there was an interrupt which normally terminates the WebsocketWriteThread and causes all remaining message to be pushed out (testsuite fails on random test cases, which is probably caused by a high load and is not representive for a real usage scenario)
diff --git a/src/main/java/org/java_websocket/client/WebSocketClient.java b/src/main/java/org/java_websocket/client/WebSocketClient.java
@@ -370,12 +370,6 @@ public final void onWebsocketClose( WebSocket conn, int code, String reason, boo
 		stopConnectionLostTimer();
 		if( writeThread != null )
 			writeThread.interrupt();
-		try {
-			if( socket != null )
-				socket.close();
-		} catch ( IOException e ) {
-			onWebsocketError( this, e );
-		}
 		onClose( code, reason, remote );
 		connectLatch.countDown();
 		closeLatch.countDown();
@@ -464,16 +458,34 @@ private class WebsocketWriteThread implements Runnable {
 		public void run() {
 			Thread.currentThread().setName( "WebsocketWriteThread" );
 			try {
-				while( !Thread.interrupted() ) {
-					ByteBuffer buffer = engine.outQueue.take();
-					ostream.write( buffer.array(), 0, buffer.limit() );
-					ostream.flush();
+				try {
+					while( !Thread.interrupted() ) {
+						ByteBuffer buffer = engine.outQueue.take();
+						ostream.write( buffer.array(), 0, buffer.limit() );
+						ostream.flush();
+					}
+				} catch ( InterruptedException e ) {
+					for (ByteBuffer buffer : engine.outQueue) {
+						ostream.write( buffer.array(), 0, buffer.limit() );
+						ostream.flush();
+					}
 				}
 			} catch ( IOException e ) {
-				handleIOException(e);
-			} catch ( InterruptedException e ) {
-				// this thread is regularly terminated via an interrupt
+				handleIOException( e );
+			} finally {
+				closeOutputAndSocket();
+			}
+		}
+	}
+
+	private void closeOutputAndSocket() {
+		try {
+			if( socket != null ) {
+				socket.shutdownOutput();
+				socket.close();
 			}
+		} catch ( IOException ex ) {
+			onWebsocketError( this, ex );
 		}
 	}
 
