Author: markt Date: Tue May 21 10:43:29 2013 New Revision: 1484743 URL: http://svn.apache.org/r1484743 Log: flushRequired applies to final write only
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1484743&r1=1484742&r2=1484743&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java Tue May 21 10:43:29 2013 @@ -602,7 +602,7 @@ public abstract class WsRemoteEndpointIm private final ByteBuffer payload; private final byte[] mask; private final ByteBuffer outputBuffer; - private volatile boolean flushRequired; + private final boolean flushRequired; private final WsRemoteEndpointImplBase endpoint; private int maskIndex = 0; @@ -626,7 +626,6 @@ public abstract class WsRemoteEndpointIm } if (headerBuffer.hasRemaining()) { // Still more headers to write, need to flush - flushRequired = true; outputBuffer.flip(); endpoint.doWrite(this, outputBuffer); return; @@ -642,14 +641,12 @@ public abstract class WsRemoteEndpointIm } if (payload.hasRemaining()) { // Still more headers to write, need to flush - flushRequired = true; outputBuffer.flip(); endpoint.doWrite(this, outputBuffer); return; } if (flushRequired) { - flushRequired = false; outputBuffer.flip(); if (outputBuffer.remaining() == 0) { handler.onResult(new SendResult()); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org