Author: markt
Date: Mon Sep 30 19:33:41 2013
New Revision: 1527735
URL: http://svn.apache.org/r1527735
Log:
Rename method
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:r1527728
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=1527735&r1=1527734&r2=1527735&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 19:33:41 2013
@@ -901,10 +901,10 @@ public class AprEndpoint extends Abstrac
if (poller != null) {
poller.remove(socket);
}
- destroySocket(socket, running);
+ destroySocketInternal(socket, running);
}
- private void destroySocket(long socket, boolean doIt) {
+ private void destroySocketInternal(long socket, boolean doIt) {
connections.remove(Long.valueOf(socket));
if (log.isDebugEnabled()) {
String msg = sm.getString("endpoint.debug.destroySocket",
@@ -1409,7 +1409,7 @@ public class AprEndpoint extends Abstrac
Long.valueOf(desc[n*2+1])).isComet();
if (!comet || (comet && !processSocket(
desc[n*2+1], SocketStatus.STOP))) {
- destroySocket(desc[n*2+1], true);
+ destroySocketInternal(desc[n*2+1], true);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
