You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/09/17 12:59:03 UTC
svn commit: r1523982 -
/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Author: markt
Date: Tue Sep 17 10:59:02 2013
New Revision: 1523982
URL: http://svn.apache.org/r1523982
Log:
Avoid possible poller error with sendfile
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=1523982&r1=1523981&r2=1523982&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue Sep 17 10:59:02 2013
@@ -1593,6 +1593,7 @@ public class AprEndpoint extends Abstrac
}
}
+ // Don't add or poll if the poller has been stopped
if (!pollerRunning) {
break;
}
@@ -2039,6 +2040,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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org