svn commit: r1535822 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/AprEndpoint.java

[ma...@apache.org]

Author: markt
Date: Fri Oct 25 19:08:41 2013
New Revision: 1535822

URL: http://svn.apache.org/r1535822
Log:
Remove socket from list of connections as soon as we know it is going to be closed.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1534543

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=1535822&r1=1535821&r2=1535822&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 Fri Oct 25 19:08:41 2013
@@ -895,6 +895,8 @@ public class AprEndpoint extends Abstrac
         // parent pool or acceptor socket.
         // In any case disable double free which would cause JVM core.
 
+        connections.remove(Long.valueOf(socket));
+
         // While the connector is running, destroySocket() will call
         // countDownConnection(). Once the connector is stopped, the latch is
         // removed so it does not matter that destroySocket() does not call



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