Author: markt
Date: Mon Sep 5 17:25:31 2011
New Revision: 1165368
URL: http://svn.apache.org/viewvc?rev=1165368&view=rev
Log:
Align while loop test
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1165368&r1=1165367&r2=1165368&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Mon Sep
5 17:25:31 2011
@@ -195,7 +195,8 @@ public class Http11AprProcessor extends
long socketRef = socketWrapper.getSocket().longValue();
- while (!error && keepAlive && !comet && !isAsync() &&
!endpoint.isPaused()) {
+ while (!error && keepAlive && !comet && !isAsync() &&
+ !endpoint.isPaused()) {
// Parsing the request header
try {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1165368&r1=1165367&r2=1165368&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Mon Sep
5 17:25:31 2011
@@ -222,7 +222,9 @@ public class Http11NioProcessor extends
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
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1165368&r1=1165367&r2=1165368&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Mon Sep 5
17:25:31 2011
@@ -157,7 +157,8 @@ public class Http11Processor extends Abs
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 Abs
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;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
