This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new de0cf8c Quick fix for poller issue reported on users list
de0cf8c is described below
commit de0cf8c4520f039fbd5b32a69fbcbec10ee4e59c
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Jul 3 20:44:41 2019 +0100
Quick fix for poller issue reported on users list
---
java/org/apache/tomcat/util/net/AprEndpoint.java | 2 ++
webapps/docs/changelog.xml | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 2e2324a..adb01b6 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -1894,6 +1894,8 @@ public class AprEndpoint extends AbstractEndpoint<Long> {
//ArrayList<Long> skip = null;
int rv = 0;
+ // Reset the nextPollerTime
+ nextPollerTime = pollerTime;
// Iterate on each pollers, but no need to poll empty
pollers
if (pollerSpace[i] < actualPollerSize) {
rv = Poll.poll(pollers[i], nextPollerTime, desc,
true);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 46d3c79..8c7c16b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -147,6 +147,10 @@
Refactor Hostname validation to improve performance. Patch provided by
Uwe Hees. (markt)
</scode>
+ <fix>
+ Fix to avoid the possibility of long poll times for individual pollers
+ when using mutliple pollers with APR. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
