From: remm <remm@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 22 Mar 2007 12:58:07 +0000 (+0000)
Subject: - Fix problem with blocking reads for keepalive when using an executor (the number... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=a0b765f7fd6e45452430c96de0b27dfab25dd99f;p=tomcat7.0

- Fix problem with blocking reads for keepalive when using an executor (the number of busy threads is always 0).

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@521246 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/coyote/ajp/AjpAprProcessor.java b/java/org/apache/coyote/ajp/AjpAprProcessor.java
index 693d65628..a9659ee8b 100644
--- a/java/org/apache/coyote/ajp/AjpAprProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpAprProcessor.java
@@ -385,7 +385,7 @@ public class AjpAprProcessor implements ActionHook {
             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
diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java
index 7e80637b9..124a72c26 100644
--- a/java/org/apache/coyote/http11/Http11AprProcessor.java
+++ b/java/org/apache/coyote/http11/Http11AprProcessor.java
@@ -816,7 +816,7 @@ public class Http11AprProcessor implements ActionHook {
                     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