Author: remy.maucherat(a)jboss.com
Date: 2013-09-24 09:00:09 -0400 (Tue, 24 Sep 2013)
New Revision: 2263
Modified:
branches/7.4.x/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java
branches/7.4.x/src/main/java/org/apache/catalina/connector/Request.java
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Log:
Add an explicit flush when completing a real write.
Modified: branches/7.4.x/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java
===================================================================
---
branches/7.4.x/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java 2013-09-23
15:21:13 UTC (rev 2262)
+++
branches/7.4.x/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java 2013-09-24
13:00:09 UTC (rev 2263)
@@ -341,6 +341,10 @@
(request.getAsyncContext() == null) ? Boolean.TRUE :
Boolean.FALSE);
event = true;
}
+ if (request.getUpgradeHandler() != null) {
+ // Call to signal that the upgrade is now done
+ request.getUpgradeHandler().init(request.getEvent());
+ }
} else if (request.getAsyncContext() != null) {
// The AC was closed right away, so call onComplete as no event
callback
// will occur in that case
Modified: branches/7.4.x/src/main/java/org/apache/catalina/connector/Request.java
===================================================================
--- branches/7.4.x/src/main/java/org/apache/catalina/connector/Request.java 2013-09-23
15:21:13 UTC (rev 2262)
+++ branches/7.4.x/src/main/java/org/apache/catalina/connector/Request.java 2013-09-24
13:00:09 UTC (rev 2263)
@@ -3323,8 +3323,8 @@
}
response.sendUpgrade();
eventMode = true;
- ugradeHandler.init(getEvent());
this.upgradeHandler = ugradeHandler;
+ asyncContext = new AsyncContextImpl();
return ugradeHandler;
}
Modified:
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
===================================================================
---
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java 2013-09-23
15:21:13 UTC (rev 2262)
+++
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java 2013-09-24
13:00:09 UTC (rev 2263)
@@ -82,6 +82,9 @@
}
if (complete) {
wsWriteTimeout.unregister(this);
+ // ADD: Explicit flush
+ sos.flush();
+ // END ADD
if (close) {
close();
}
Show replies by date