Author: markt Date: Thu Jan 5 15:06:04 2017 New Revision: 1777470 URL: http://svn.apache.org/viewvc?rev=1777470&view=rev Log: ws fixes
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1777470&r1=1777469&r2=1777470&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu Jan 5 15:06:04 2017 @@ -771,12 +771,12 @@ public class NioEndpoint extends Abstrac return true; } - + @Override public void removeWaitingRequest(SocketWrapper<NioChannel> socketWrapper) { // NO-OP } - + @Override protected Log getLog() { @@ -1100,7 +1100,7 @@ public class NioEndpoint extends Abstrac else r.reset(socket,ka,OP_REGISTER); addEvent(r); } - + public KeyAttachment cancelledKey(SelectionKey key, SocketStatus status, boolean dispatch) { KeyAttachment ka = null; try { @@ -1388,10 +1388,10 @@ public class NioEndpoint extends Abstrac // appropriate event(s) if sendfile completes. if (!calledByProcessor) { if ( sd.keepAlive ) { - if (log.isDebugEnabled()) { - log.debug("Connection is keep alive, registering back for OP_READ"); - } - reg(sk,attachment,SelectionKey.OP_READ); + if (log.isDebugEnabled()) { + log.debug("Connection is keep alive, registering back for OP_READ"); + } + reg(sk,attachment,SelectionKey.OP_READ); } else { if (log.isDebugEnabled()) { log.debug("Send file connection is being closed"); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org