Author: markt
Date: Thu Jun 14 08:22:22 2012
New Revision: 1350125
URL: http://svn.apache.org/viewvc?rev=1350125&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53173
Remove some duplicate calls to countDownConnection()
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 countDownConnection() in that case
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1349984,1350124
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=1350125&r1=1350124&r2=1350125&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 Thu
Jun 14 08:22:22 2012
@@ -902,6 +902,11 @@ public class AprEndpoint extends Abstrac
// If not running the socket will be destroyed by
// parent pool or acceptor socket.
// In any case disable double free which would cause JVM core.
+
+ // 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
+ // countDownConnection() in that case
destroySocket(socket, running);
}
@@ -977,12 +982,10 @@ public class AprEndpoint extends Abstrac
if (running && !paused) {
// Hand this socket off to an appropriate processor
if (!processSocketWithOptions(socket)) {
- countDownConnection();
// Close socket and pool right away
destroySocket(socket);
}
} else {
- countDownConnection();
// Close socket and pool right away
destroySocket(socket);
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1350125&r1=1350124&r2=1350125&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jun 14 08:22:22 2012
@@ -295,8 +295,7 @@
header. Based on a patch suggested by Philippe Marschall. (markt)
</add>
<fix>
- <bug>53173</bug> (<rev>1333116</rev>) :
- Properly count down maxConnections (fhanik)
+ <bug>53173</bug>: Properly count down maxConnections (fhanik)
</fix>
<update>
Update default value of pollerThreadCount for the NIO connector.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
