Author: markt
Date: Sat Feb 14 17:53:43 2015
New Revision: 1659825
URL: http://svn.apache.org/r1659825
Log:
Whoops :)
Only disable the timeout (to prevent multiple activations of the same timeout)
once it has actually happened
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1659825&r1=1659824&r2=1659825&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Sat Feb
14 17:53:43 2015
@@ -144,10 +144,10 @@ public abstract class AbstractEndpoint<S
for (SocketWrapperBase<S> socket : waitingRequests) {
long asyncTimeout = socket.getAsyncTimeout();
if (asyncTimeout > 0) {
- // Avoid multiple timeouts
- socket.setAsyncTimeout(-1);
long asyncStart = socket.getLastAsyncStart();
if ((now - asyncStart) > asyncTimeout) {
+ // Avoid multiple timeouts
+ socket.setAsyncTimeout(-1);
processSocket(socket, SocketStatus.TIMEOUT, true);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
