Author: remy.maucherat(a)jboss.com Date: 2013-11-28 10:02:26 -0500 (Thu, 28 Nov 2013) New Revision: 2312 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java Log: Port additional fix for streaming. Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 2013-11-28 14:58:18 UTC (rev 2311) +++ branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 2013-11-28 15:02:26 UTC (rev 2312) @@ -782,7 +782,7 @@ } } - private static class WsOutputStream extends OutputStream { + private class WsOutputStream extends OutputStream { private final WsRemoteEndpointImplBase endpoint; private final ByteBuffer buffer = ByteBuffer.allocate(8192); @@ -857,6 +857,7 @@ private void doWrite(boolean last) throws IOException { buffer.flip(); endpoint.startMessageBlock(Constants.OPCODE_BINARY, buffer, last); + stateMachine.complete(last); buffer.clear(); } }