Author: remm Date: Mon Jul 6 13:59:24 2015 New Revision: 1689403 URL: http://svn.apache.org/r1689403 Log: Revert r1689401: actually calling another closeSocket method, so no issue there.
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java 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=1689403&r1=1689402&r2=1689403&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Mon Jul 6 13:59:24 2015 @@ -522,9 +522,11 @@ public class Nio2Endpoint extends Abstra if (running && !paused) { // Hand this socket off to an appropriate processor if (!setSocketOptions(socket)) { + countDownConnection(); closeSocket(socket); } } else { + countDownConnection(); // Close socket right away closeSocket(socket); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org