Author: markt
Date: Fri Jun 13 14:00:54 2014
New Revision: 1602431
URL: http://svn.apache.org/r1602431
Log:
Move resetting of error state to the processor's recycle method.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1600162
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1602431&r1=1602430&r2=1602431&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java Fri Jun
13 14:00:54 2014
@@ -40,7 +40,7 @@ public abstract class AbstractProcessor<
/**
* Error state for the request/response currently being processed.
*/
- private ErrorState errorState;
+ private ErrorState errorState = ErrorState.NONE;
/**
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1602431&r1=1602430&r2=1602431&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
Fri Jun 13 14:00:54 2014
@@ -620,6 +620,7 @@ public abstract class AbstractAjpProcess
certificates.recycle();
swallowResponse = false;
bytesWritten = 0;
+ resetErrorState();
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1602431&r1=1602430&r2=1602431&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Fri
Jun 13 14:00:54 2014
@@ -109,8 +109,6 @@ public class AjpAprProcessor extends Abs
Socket.setsbb(socketRef, outputBuffer);
boolean cping = false;
- resetErrorState();
-
boolean keptAlive = false;
while (!getErrorState().isError() && !endpoint.isPaused()) {
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1602431&r1=1602430&r2=1602431&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Fri
Jun 13 14:00:54 2014
@@ -94,8 +94,6 @@ public class AjpNioProcessor extends Abs
long soTimeout = endpoint.getSoTimeout();
boolean cping = false;
- resetErrorState();
-
while (!getErrorState().isError() && !endpoint.isPaused()) {
// Parsing the request header
try {
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1602431&r1=1602430&r2=1602431&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Fri Jun
13 14:00:54 2014
@@ -107,8 +107,6 @@ public class AjpProcessor extends Abstra
}
boolean cping = false;
- resetErrorState();
-
while (!getErrorState().isError() && !endpoint.isPaused()) {
// Parsing the request header
try {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1602431&r1=1602430&r2=1602431&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Fri Jun 13 14:00:54 2014
@@ -963,7 +963,6 @@ public abstract class AbstractHttp11Proc
} else {
keptAlive = socketWrapper.isKeptAlive();
}
- resetErrorState();
if (disableKeepAlive()) {
socketWrapper.setKeepAliveLeft(0);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
