Boxing "bufferQueueTotalAmount" so that the Synchronization is done over it's internal semaphore, not the WebSocket instance one.

detro · detro · commit 8a5a0ee57102 · 2012-03-08T10:08:33.000Z
diff --git a/src/org/java_websocket/WebSocket.java b/src/org/java_websocket/WebSocket.java
@@ -93,7 +93,7 @@ public enum Role {
 	 * The amount of bytes still in queue to be sent, at every given time.
 	 * It's updated at every send/sent operation.
 	 */
-	private long bufferQueueTotalAmount = 0;
+	private Long bufferQueueTotalAmount = (long) 0;
 
 	private Draft draft = null;
 
@@ -494,7 +494,7 @@ public void flush() throws IOException {
 			if( buffer.remaining() > 0 ) {
 				continue;
 			} else {
-				synchronized (this) {
+				synchronized (bufferQueueTotalAmount) {
 					// subtract this amount of data from the total queued (synchronized over this object)
 					bufferQueueTotalAmount -= buffer.limit();
 				}
@@ -545,7 +545,7 @@ private void channelWrite( ByteBuffer buf ) throws InterruptedException {
 		if( DEBUG )
 			System.out.println( "write(" + buf.limit() + "): {" + ( buf.limit() > 1000 ? "too big to display" : new String( buf.array() ) ) + "}" );
 		buf.rewind();
-		synchronized (this) {
+		synchronized (bufferQueueTotalAmount) {
 			// add up the number of bytes to the total queued (synchronized over this object)
 			bufferQueueTotalAmount += buf.limit();
 		}
