Author: markt
Date: Tue Jun 10 20:01:05 2014
New Revision: 1601761
URL: http://svn.apache.org/r1601761
Log:
Fix failures to timeout async requests after refactoring. The removed condition
was added to the APR connector (by me) some time ago but reviewing the current
code I can see no reason for it to stay.
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=1601761&r1=1601760&r2=1601761&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Tue Jun
10 20:01:05 2014
@@ -125,12 +125,9 @@ public abstract class AbstractEndpoint<S
Iterator<SocketWrapper<S>> sockets =
waitingRequests.keySet().iterator();
while (sockets.hasNext()) {
SocketWrapper<S> socket = sockets.next();
- if (socket.isAsync()) {
- long access = socket.getLastAccess();
- if (socket.getTimeout() > 0 &&
- (now-access) > socket.getTimeout()) {
- processSocket(socket, SocketStatus.TIMEOUT, true);
- }
+ long access = socket.getLastAccess();
+ if (socket.getTimeout() > 0 && (now - access) >
socket.getTimeout()) {
+ processSocket(socket, SocketStatus.TIMEOUT, true);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
