Author: fhanik Date: Tue Jun 9 22:28:00 2009 New Revision: 783160 URL: http://svn.apache.org/viewvc?rev=783160&view=rev Log: Put a short timeout on the unlock accept
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=783160&r1=783159&r2=783160&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue Jun 9 22:28:00 2009 @@ -1034,8 +1034,10 @@ // Need to create a connection to unlock the accept(); if (address == null) { s = new java.net.Socket("127.0.0.1", port); + s.setSoTimeout(2000); } else { s = new java.net.Socket(address, port); + s.setSoTimeout(2000); // setting soLinger to a small value will help shutdown the // connection quicker s.setSoLinger(true, 0); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org