Author: markt
Date: Mon Sep 16 23:03:57 2013
New Revision: 1523831
URL: http://svn.apache.org/r1523831
Log:
Fix logic where poller thread could get stuck in infinite loop on connector
stop.
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:r1523830
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=1523831&r1=1523830&r2=1523831&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 Mon
Sep 16 23:03:57 2013
@@ -1559,7 +1559,7 @@ public class AprEndpoint extends Abstrac
while (pollerRunning) {
// Loop if endpoint is paused
- while (paused) {
+ while (pollerRunning && paused) {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
