Author: remm
Date: Tue Dec 2 21:15:44 2014
New Revision: 1643007
URL: http://svn.apache.org/r1643007
Log:
As an additional cleanup, don't write any empty message when flushing and
there's no data to flush.
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=1643007&r1=1643006&r2=1643007&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Tue Dec 2 21:15:44 2014
@@ -937,7 +937,9 @@ public abstract class WsRemoteEndpointIm
sm.getString("wsRemoteEndpoint.closedOutputStream"));
}
- doWrite(false);
+ if (buffer.position() > 0) {
+ doWrite(false);
+ }
}
@Override
@@ -1012,7 +1014,9 @@ public abstract class WsRemoteEndpointIm
sm.getString("wsRemoteEndpoint.closedWriter"));
}
- doWrite(false);
+ if (buffer.position() > 0) {
+ doWrite(false);
+ }
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
