[prev in list] [next in list] [prev in thread] [next in thread] 

List:       tomcat-dev
Subject:    svn commit: r1546383 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/WsRemoteEndpoin
From:       markt () apache ! org
Date:       2013-11-28 14:55:51
Message-ID: 20131128145551.6D4A62388A56 () eris ! apache ! org
[Download RAW message or body]

Author: markt
Date: Thu Nov 28 14:55:50 2013
New Revision: 1546383

URL: http://svn.apache.org/r1546383
Log:
Additional fix required for bug 55799

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java


Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1546382

Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
                
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1546383&r1=1546382&r2=1546383&view=diff
 ==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java \
                (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java \
Thu Nov 28 14:55:50 2013 @@ -793,7 +793,7 @@ public abstract class WsRemoteEndpointIm
         }
     }
 
-    private static class WsOutputStream extends OutputStream {
+    private class WsOutputStream extends OutputStream {
 
         private final WsRemoteEndpointImplBase endpoint;
         private final ByteBuffer buffer = ByteBuffer.allocate(8192);
@@ -871,6 +871,7 @@ public abstract class WsRemoteEndpointIm
         private void doWrite(boolean last) throws IOException {
             buffer.flip();
             endpoint.startMessageBlock(Constants.OPCODE_BINARY, buffer, last);
+            stateMachine.complete(last);
             buffer.clear();
         }
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


[prev in list] [next in list] [prev in thread] [next in thread]