Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 30630 invoked from network); 9 Oct 2008 12:38:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 9 Oct 2008 12:38:02 -0000 Received: (qmail 8311 invoked by uid 500); 9 Oct 2008 12:37:57 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 8265 invoked by uid 500); 9 Oct 2008 12:37:57 -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 8254 invoked by uid 99); 9 Oct 2008 12:37:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Oct 2008 05:37:57 -0700 X-ASF-Spam-Status: No, hits=-1999.9 required=10.0 tests=ALL_TRUSTED,DNS_FROM_SECURITYSAGE 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; Thu, 09 Oct 2008 12:37:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8D679238885D; Thu, 9 Oct 2008 05:37:07 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r703154 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java webapps/docs/changelog.xml Date: Thu, 09 Oct 2008 12:37:07 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081009123707.8D679238885D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Thu Oct 9 05:37:06 2008 New Revision: 703154 URL: http://svn.apache.org/viewvc?rev=703154&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45618 Make sure selector is closed. Unlikely to be an issue for most (all?) circumstances but technically needs fixing. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 9 05:37:06 2008 @@ -1 +1 @@ -/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691805,692748,695053,695311,698012,698227,698236,698613 +/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,698012,698227,698236,698613 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=703154&r1=703153&r2=703154&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 9 05:37:06 2008 @@ -88,14 +88,6 @@ +1: markt, remm -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45618 - Make sure selector is closed. - Unlikely to be an issue for most (all?) circumstances but technically - needs fixing, - http://svn.apache.org/viewvc?rev=691392&view=rev - +1: markt, rjung, fhanik - -1: - * ETag improvement: https://issues.apache.org/bugzilla/show_bug.cgi?id=45735 +1: remm, markt, rjung -1: Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java?rev=703154&r1=703153&r2=703154&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java Thu Oct 9 05:37:06 2008 @@ -275,6 +275,7 @@ public void finalize() { try {disconnect(); }catch ( Exception ignore){} + try {selector.close();} catch (Exception ignore) {} } public boolean keepalive() { Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=703154&r1=703153&r2=703154&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Oct 9 05:37:06 2008 @@ -146,6 +146,10 @@ Document the multicast recovery options. (fhanik) + + 45618: Make sure NIO selector is closed when no longer used. + Unlikely to be an issue in normal usage. (markt) + --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org