Author: markt
Date: Tue Mar 10 21:02:00 2015
New Revision: 1665694
URL: http://svn.apache.org/r1665694
Log:
Noticed while reviewing BZ 57653.
When destroy() waits for the poller to exit, it needs to account for when there
are multiple pollers.
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=1665694&r1=1665693&r2=1665694&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue Mar 10
21:02:00 2015
@@ -1412,7 +1412,7 @@ public class AprEndpoint extends Abstrac
// still in the poller can cause problems
try {
this.notify();
- this.wait(pollTime / 1000);
+ this.wait(pollerCount * pollTime / 1000);
} catch (InterruptedException e) {
// Ignore
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
