svn commit: r1527470 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml

[markt]

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).
 -->
 <section name="Tomcat 7.0.46 (violetagg)">
+  <subsection name="Coyote">
+    <changelog>
+      <scode>
+        Refactor APR endpoint to reduce scope of <code>localAddList</code>.
+        (markt)
+      </scode>
+    </changelog>
+  </subsection>
   <subsection name="Cluster">
     <changelog>
       <add>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org