From bb48e22ed2f3e962a5de298369e657211c4abb1a Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 18 Jul 2011 15:15:26 +0000 Subject: [PATCH] Cleaner code git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1147925 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/tomcat/util/net/NioEndpoint.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java index 388c8941f..cb628df24 100644 --- a/java/org/apache/tomcat/util/net/NioEndpoint.java +++ b/java/org/apache/tomcat/util/net/NioEndpoint.java @@ -1339,10 +1339,7 @@ public class NioEndpoint extends AbstractEndpoint { //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 = false; - if (timeout > 0) { - isTimedout = delta > timeout; - } + boolean isTimedout = timeout > 0 && delta > timeout; if ( close ) { key.interestOps(0); ka.interestOps(0); //avoid duplicate stop calls -- 2.11.0