Author: remm
Date: Thu Mar 22 05:58:07 2007
New Revision: 521246
URL: http://svn.apache.org/viewvc?view=rev&rev=521246
Log:
- Fix problem with blocking reads for keepalive when using an executor (the
number of busy threads is always 0).
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?view=diff&rev=521246&r1=521245&r2=521246
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Thu
Mar 22 05:58:07 2007
@@ -385,7 +385,7 @@
try {
// Get first message of the request
if (!readMessage(requestHeaderMessage, true,
- keptAlive && (endpoint.getCurrentThreadsBusy() >
limit))) {
+ keptAlive && (endpoint.getCurrentThreadsBusy() >=
limit))) {
// This means that no data is available right now
// (long keepalive), so that the processor should be
recycled
// and the method should return true
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?view=diff&rev=521246&r1=521245&r2=521246
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
Thu Mar 22 05:58:07 2007
@@ -816,7 +816,7 @@
Socket.timeoutSet(socket, soTimeout * 1000);
}
if (!inputBuffer.parseRequestLine
- (keptAlive && (endpoint.getCurrentThreadsBusy() >
limit))) {
+ (keptAlive && (endpoint.getCurrentThreadsBusy() >=
limit))) {
// This means that no data is available right now
// (long keepalive), so that the processor should be
recycled
// and the method should return true
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
