Author: remm
Date: Thu Feb 26 00:18:20 2015
New Revision: 1662339
URL: http://svn.apache.org/r1662339
Log:
Revert 1662226 and try a CI run with a simple sync (will revert after that).
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1662339&r1=1662338&r2=1662339&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Thu Feb 26 00:18:20 2015
@@ -59,7 +59,7 @@ public class WsRemoteEndpointImplServer
private volatile long timeoutExpiry = -1;
private volatile boolean close;
- private volatile boolean first = true;
+ private final Object lock = new Object();
public WsRemoteEndpointImplServer(ServletInputStream sis,
ServletOutputStream sos,
WsServerContainer serverContainer) {
@@ -87,11 +87,8 @@ public class WsRemoteEndpointImplServer
public void onWritePossible(boolean useDispatch) {
- ByteBuffer[] buffers = this.buffers;
- if (first) {
- // Wait for the fist message to do something
- first = false;
- } else {
+ synchronized (lock) {
+ ByteBuffer[] buffers = this.buffers;
if (buffers == null) {
// Servlet 3.1 will call the write listener once even if
nothing
// was written
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
