Author: markt Date: Wed Mar 11 19:35:58 2015 New Revision: 1665980 URL: http://svn.apache.org/r1665980 Log: If the socket is being destroyed, need to remove it from the addList as well.
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=1665980&r1=1665979&r2=1665980&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Wed Mar 11 19:35:58 2015 @@ -1558,7 +1558,6 @@ public class AprEndpoint extends Abstrac * Timeout checks. Must only be called from {@link Poller#run()}. */ private synchronized void maintain() { - long date = System.currentTimeMillis(); // Maintain runs at most once every 1s, although it will likely get // called more @@ -1575,6 +1574,7 @@ public class AprEndpoint extends Abstrac } removeFromPoller(socket); destroySocket(socket); + addList.remove(socket); closeList.remove(socket); socket = timeouts.check(date); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org