Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5834F109E8 for ; Mon, 30 Sep 2013 07:44:07 +0000 (UTC) Received: (qmail 74264 invoked by uid 500); 30 Sep 2013 07:43:48 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 74185 invoked by uid 500); 30 Sep 2013 07:43:46 -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 74170 invoked by uid 99); 30 Sep 2013 07:43:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Sep 2013 07:43:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Mon, 30 Sep 2013 07:43:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 82A872388860 for ; Mon, 30 Sep 2013 07:43:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1527470 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml Date: Mon, 30 Sep 2013 07:43:20 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130930074320.82A872388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Mon Sep 30 07:43:19 2013 New Revision: 1527470 URL: http://svn.apache.org/r1527470 Log: Narrow scope of localAddList Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1523982,1526043 Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1527470&r1=1527469&r2=1527470&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Sep 30 07:43:19 2013 @@ -1266,11 +1266,7 @@ public class AprEndpoint extends Abstrac */ protected SocketList addList = null; - /** - * List of sockets to be added to the poller. - */ - protected SocketList localAddList = null; - + /** * Structure used for storing timeouts. */ @@ -1345,7 +1341,6 @@ public class AprEndpoint extends Abstrac desc = new long[actualPollerSize * 2]; connectionCount = 0; addList = new SocketList(defaultPollerSize); - localAddList = new SocketList(defaultPollerSize); } @@ -1494,6 +1489,7 @@ public class AprEndpoint extends Abstrac } } } + timeouts.remove(socket); return (rv == Status.APR_SUCCESS); } @@ -1555,6 +1551,9 @@ public class AprEndpoint extends Abstrac public void run() { int maintain = 0; + SocketList localAddList = new SocketList(getMaxConnections()); + + // Loop until we receive a shutdown command while (pollerRunning) { Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1527470&r1=1527469&r2=1527470&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Sep 30 07:43:19 2013 @@ -56,6 +56,14 @@ issues to not "pop up" wrt. others). -->
+ + + + Refactor APR endpoint to reduce scope of localAddList. + (markt) + + + --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org