Author: markt
Date: Mon Sep 30 19:24:07 2013
New Revision: 1527727
URL: http://svn.apache.org/r1527727
Log:
Move the point where the socket is removed from the connections Map so
all the actions apart from removal from the Poller are in a single
method to facilitate refactoring removal of the socket from the Poller.
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=1527727&r1=1527726&r2=1527727&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 30
19:24:07 2013
@@ -909,11 +909,11 @@ public class AprEndpoint extends Abstrac
if (poller != null) {
poller.remove(socket);
}
- connections.remove(Long.valueOf(socket));
destroySocket(socket, running);
}
private void destroySocket(long socket, boolean doIt) {
+ connections.remove(Long.valueOf(socket));
if (log.isDebugEnabled()) {
String msg = sm.getString("endpoint.debug.destroySocket",
Long.valueOf(socket), Boolean.valueOf(doIt));
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
