tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1528175 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/AprEndpoint.java
Date Tue, 01 Oct 2013 18:42:37 GMT
Author: markt
Date: Tue Oct  1 18:42:37 2013
New Revision: 1528175

URL: http://svn.apache.org/r1528175
Log:
If there are sockets to close, close them rather than waiting for the next Poller run.

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:r1528169

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=1528175&r1=1528174&r2=1528175&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 Tue Oct  1 18:42:37
2013
@@ -1623,7 +1623,7 @@ public class AprEndpoint extends Abstrac
                 }
                 // Check timeouts if the poller is empty
                 while (pollerRunning && connectionCount.get() < 1 &&
-                        addList.size() < 1) {
+                        addList.size() < 1 && closeList.size() < 1) {
                     // Reset maintain time.
                     try {
                         if (getSoTimeout() > 0 && pollerRunning) {



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


Mime
View raw message