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 2014/06/09 19:11:36 UTC
svn commit: r1601443 - in /tomcat/trunk/java/org/apache/tomcat/util/net:
AprEndpoint.java JIoEndpoint.java Nio2Endpoint.java
Author: markt
Date: Mon Jun 9 17:11:36 2014
New Revision: 1601443
URL: http://svn.apache.org/r1601443
Log:
Refactor to more closely align AsyncTimeout implementations
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1601443&r1=1601442&r2=1601443&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Jun 9 17:11:36 2014
@@ -1082,7 +1082,7 @@ public class AprEndpoint extends Abstrac
if (socket.isAsync()) {
long access = socket.getLastAccess();
if (socket.getTimeout() > 0 &&
- (now-access)>socket.getTimeout()) {
+ (now-access) > socket.getTimeout()) {
processSocket(socket, SocketStatus.TIMEOUT, true);
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=1601443&r1=1601442&r2=1601443&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Mon Jun 9 17:11:36 2014
@@ -168,10 +168,12 @@ public class JIoEndpoint extends Abstrac
waitingRequests.iterator();
while (sockets.hasNext()) {
SocketWrapper<Socket> socket = sockets.next();
- long access = socket.getLastAccess();
- if (socket.getTimeout() > 0 &&
- (now-access)>socket.getTimeout()) {
- processSocket(socket, SocketStatus.TIMEOUT, true);
+ if (socket.isAsync()) {
+ long access = socket.getLastAccess();
+ if (socket.getTimeout() > 0 &&
+ (now-access) > socket.getTimeout()) {
+ processSocket(socket, SocketStatus.TIMEOUT, true);
+ }
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1601443&r1=1601442&r2=1601443&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Mon Jun 9 17:11:36 2014
@@ -760,10 +760,12 @@ public class Nio2Endpoint extends Abstra
waitingRequests.keySet().iterator();
while (sockets.hasNext()) {
SocketWrapper<Nio2Channel> socket = sockets.next();
- long access = socket.getLastAccess();
- if (socket.getTimeout() > 0 &&
- (now-access) > socket.getTimeout()) {
- processSocket(socket, SocketStatus.TIMEOUT, true);
+ if (socket.isAsync()) {
+ long access = socket.getLastAccess();
+ if (socket.getTimeout() > 0 &&
+ (now-access) > socket.getTimeout()) {
+ processSocket(socket, SocketStatus.TIMEOUT, true);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org