You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/12/17 16:22:28 UTC
svn commit: r1774789 - in /tomcat/trunk:
java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
webapps/docs/changelog.xml
Author: markt
Date: Sat Dec 17 16:22:28 2016
New Revision: 1774789
URL: http://svn.apache.org/viewvc?rev=1774789&view=rev
Log:
Fix edge case spotted investigating CI test failures.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
tomcat/trunk/webapps/docs/changelog.xml
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=1774789&r1=1774788&r2=1774789&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java Sat Dec 17 16:22:28 2016
@@ -76,7 +76,7 @@ public class WsRemoteEndpointImplServer
// Blocking
for (ByteBuffer buffer : buffers) {
long timeout = blockingWriteTimeoutExpiry - System.currentTimeMillis();
- if (timeout < 0) {
+ if (timeout <= 0) {
SendResult sr = new SendResult(new SocketTimeoutException());
handler.onResult(sr);
return;
@@ -85,7 +85,7 @@ public class WsRemoteEndpointImplServer
try {
socketWrapper.write(true, buffer);
timeout = blockingWriteTimeoutExpiry - System.currentTimeMillis();
- if (timeout < 0) {
+ if (timeout <= 0) {
SendResult sr = new SendResult(new SocketTimeoutException());
handler.onResult(sr);
return;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1774789&r1=1774788&r2=1774789&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sat Dec 17 16:22:28 2016
@@ -105,6 +105,14 @@
(markt)
</changelog>
</subsection>
+ <subseciton name="WebSocket">
+ <changelog>
+ <fix>
+ Correctly handle blocking WebSocket writes when the write times out just
+ before the write is attempted. (markt)
+ </fix>
+ </changelog>
+ </subseciton>
<subsection name="Web Applications">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org