Author: markt
Date: Tue Feb 23 20:34:39 2016
New Revision: 1731946
URL: http://svn.apache.org/viewvc?rev=1731946&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59015
Fix potential cause of endless APR Poller loop during shutdown if the Poller
experiences an error during the shutdown process.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/webapps/docs/changelog.xml
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=1731946&r1=1731945&r2=1731946&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue Feb 23
20:34:39 2016
@@ -1844,7 +1844,7 @@ public class AprEndpoint extends Abstrac
}
}
- if (reset) {
+ if (reset && pollerRunning) {
// Reallocate the current poller
int count = Poll.pollset(pollers[i], desc);
long newPoller = allocatePoller(actualPollerSize,
pool, -1);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1731946&r1=1731945&r2=1731946&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Feb 23 20:34:39 2016
@@ -134,6 +134,11 @@
<fix>
Use JSSE session configuration options with OpenSSL. (remm)
</fix>
+ <fix>
+ <bug>59015</bug>: Fix potential cause of endless APR Poller loop during
+ shutdown if the Poller experiences an error during the shutdown
process.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="WebSocket">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
