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

[ma...@apache.org]

Author: markt
Date: Mon Sep 16 20:06:07 2013
New Revision: 1523781

URL: http://svn.apache.org/r1523781
Log:
Fix error showing in unit tests when socket is closed while still in poller. This happened after a web-socket timeout.

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=1523781&r1=1523780&r2=1523781&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Sep 16 20:06:07 2013
@@ -905,6 +905,7 @@ public class AprEndpoint extends Abstrac
         // countDownConnection(). Once the connector is stopped, the latch is
         // removed so it does not matter that destroySocket() does not call
         // countDownConnection() in that case
+        poller.removeFromPoller(socket);
         connections.remove(Long.valueOf(socket));
         destroySocket(socket, running);
     }



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