Author: markt Date: Wed Jun 4 12:54:41 2014 New Revision: 1600162 URL: http://svn.apache.org/r1600162 Log: Move resetting of error state to the processor's recycle method.
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1600162&r1=1600161&r2=1600162&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Wed Jun 4 12:54:41 2014 @@ -42,7 +42,7 @@ public abstract class AbstractProcessor< /** * Error state for the request/response currently being processed. */ - private ErrorState errorState; + private ErrorState errorState = ErrorState.NONE; /** Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1600162&r1=1600161&r2=1600162&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Wed Jun 4 12:54:41 2014 @@ -739,9 +739,6 @@ public abstract class AbstractAjpProcess int soTimeout = endpoint.getSoTimeout(); boolean cping = false; - // Error flag - resetErrorState(); - boolean keptAlive = false; while (!getErrorState().isError() && !endpoint.isPaused()) { @@ -936,6 +933,7 @@ public abstract class AbstractAjpProcess certificates.recycle(); swallowResponse = false; bytesWritten = 0; + resetErrorState(); } Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1600162&r1=1600161&r2=1600162&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Wed Jun 4 12:54:41 2014 @@ -972,7 +972,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