Author: markt
Date: Thu Jan 31 14:03:05 2013
New Revision: 1440963
URL: http://svn.apache.org/viewvc?rev=1440963&view=rev
Log:
Fix logic error if timeout < 1 (i.e.disabled/infinite)
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java?rev=1440963&r1=1440962&r2=1440963&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java
Thu Jan 31 14:03:05 2013
@@ -102,9 +102,10 @@ public class WsRemoteEndpointServer exte
if (handler != null) {
// Async write is in progress
- timeoutExpiry = getAsyncSendTimeout() + System.currentTimeMillis();
- if (timeoutExpiry > 0) {
+ long timeout = getAsyncSendTimeout();
+ if (timeout > 0) {
// Register with timeout thread
+ timeoutExpiry = timeout + System.currentTimeMillis();
wsTimeout.register(this);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
