Align while loop test

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

diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java
index 718a125..1e28147 100644 (file)
--- a/java/org/apache/coyote/http11/Http11AprProcessor.java
+++ b/java/org/apache/coyote/http11/Http11AprProcessor.java
@@ -195,7 +195,8 @@ public class Http11AprProcessor extends AbstractHttp11Processor<Long> {
 
         long socketRef = socketWrapper.getSocket().longValue();
 
-        while (!error && keepAlive && !comet && !isAsync() && !endpoint.isPaused()) {
+        while (!error && keepAlive && !comet && !isAsync() &&
+                !endpoint.isPaused()) {
 
             // Parsing the request header
             try {

diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java
index 2f5af31..74d3016 100644 (file)
--- a/java/org/apache/coyote/http11/Http11NioProcessor.java
+++ b/java/org/apache/coyote/http11/Http11NioProcessor.java
@@ -222,7 +222,9 @@ public class Http11NioProcessor extends AbstractHttp11Processor<NioChannel> {
 
         boolean keptAlive = false;
         
-        while (!error && keepAlive && !comet && !isAsync() && !endpoint.isPaused()) {
+        while (!error && keepAlive && !comet && !isAsync() &&
+                !endpoint.isPaused()) {
+
             //always default to our soTimeout
             socketWrapper.setTimeout(soTimeout);
             // Parsing the request header

diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java
index 34f6aae..55c7eff 100644 (file)
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -157,7 +157,8 @@ public class Http11Processor extends AbstractHttp11Processor<Socket> {
 
         boolean keptAlive = socketWrapper.isKeptAlive();
 
-        while (!error && keepAlive && !endpoint.isPaused()) {
+        while (!error && keepAlive && !comet && !isAsync() &&
+                !endpoint.isPaused()) {
 
             // Parsing the request header
             try {
@@ -358,7 +359,7 @@ public class Http11Processor extends AbstractHttp11Processor<Socket> {
     protected boolean breakKeepAliveLoop(SocketWrapper<Socket> socketWrapper) {
         // If we don't have a pipe-lined request allow this thread to be
         // used by another connection
-        if (isAsync() || error || inputBuffer.lastValid == 0) {
+        if (inputBuffer.lastValid == 0) {
             return true;
         }
         return false;