Author: markt
Date: Tue Sep 17 10:57:31 2013
New Revision: 1523981
URL: http://svn.apache.org/r1523981
Log:
Avoid possible poller error with sendfile
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
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=1523981&r1=1523980&r2=1523981&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 Tue
Sep 17 10:57:31 2013
@@ -1585,6 +1585,7 @@ public class AprEndpoint extends Abstrac
}
}
+ // Don't add or poll if the poller has been stopped
if (!pollerRunning) {
break;
}
@@ -1987,6 +1988,11 @@ public class AprEndpoint extends Abstrac
}
}
+ // Don't add or poll if the poller has been stopped
+ if (!sendfileRunning) {
+ break;
+ }
+
try {
// Add socket to the poller
if (addS.size() > 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
