tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1349984 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Date Wed, 13 Jun 2012 18:29:07 GMT
Author: markt
Date: Wed Jun 13 18:29:07 2012
New Revision: 1349984

URL: http://svn.apache.org/viewvc?rev=1349984&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/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=1349984&r1=1349983&r2=1349984&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Wed Jun 13 18:29:07 2012
@@ -981,12 +981,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);
                     }



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


Mime
View raw message