Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 56396 invoked from network); 9 Jun 2009 22:28:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Jun 2009 22:28:12 -0000 Received: (qmail 41296 invoked by uid 500); 9 Jun 2009 22:28:23 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 41222 invoked by uid 500); 9 Jun 2009 22:28:23 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 41211 invoked by uid 99); 9 Jun 2009 22:28:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jun 2009 22:28:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jun 2009 22:28:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EADF523888BD; Tue, 9 Jun 2009 22:28:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r783160 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Date: Tue, 09 Jun 2009 22:28:00 -0000 To: dev@tomcat.apache.org From: fhanik@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090609222800.EADF523888BD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org