svn commit: r1526043 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

[ma...@apache.org]

Author: markt
Date: Tue Sep 24 22:49:13 2013
New Revision: 1526043

URL: http://svn.apache.org/r1526043
Log:
Narrow scope of localAddList

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1526043&r1=1526042&r2=1526043&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue Sep 24 22:49:13 2013
@@ -1274,10 +1274,6 @@ public class AprEndpoint extends Abstrac
          */
         private SocketList addList = null;
 
-        /**
-         * List of sockets to be added to the poller.
-         */
-        private SocketList localAddList = null;
 
         /**
          * Structure used for storing timeouts.
@@ -1353,7 +1349,6 @@ public class AprEndpoint extends Abstrac
             desc = new long[actualPollerSize * 2];
             connectionCount = 0;
             addList = new SocketList(defaultPollerSize);
-            localAddList = new SocketList(defaultPollerSize);
         }
 
 
@@ -1502,6 +1497,7 @@ public class AprEndpoint extends Abstrac
                     }
                 }
             }
+            timeouts.remove(socket);
             return (rv == Status.APR_SUCCESS);
         }
 
@@ -1563,6 +1559,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) {
 



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