Author: markt
Date: Mon Jul 18 15:10:29 2011
New Revision: 1147921
URL: http://svn.apache.org/viewvc?rev=1147921&view=rev
Log:
Only test for timeouts if timeout is greater than zero (aligns with BIO and APR)
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1147921&r1=1147920&r2=1147921&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Mon Jul 18
15:10:29 2011
@@ -1339,7 +1339,10 @@ public class NioEndpoint extends Abstrac
//only timeout sockets that we are waiting for a read
from
long delta = now - ka.getLastAccess();
long timeout = (ka.getTimeout()==-1)?((long)
socketProperties.getSoTimeout()):(ka.getTimeout());
- boolean isTimedout = delta > timeout;
+ boolean isTimedout = false;
+ if (timeout > 0) {
+ isTimedout = delta > timeout;
+ }
if ( close ) {
key.interestOps(0);
ka.interestOps(0); //avoid duplicate stop calls
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
