Author: markt
Date: Tue May 31 17:37:25 2016
New Revision: 1746306
URL: http://svn.apache.org/viewvc?rev=1746306&view=rev
Log:
Simplify.
If getErrorState().isError() is true then response.getErrorException() will
always be null.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
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=1746306&r1=1746305&r2=1746306&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue May 31
17:37:25 2016
@@ -1117,10 +1117,8 @@ public class Http11Processor extends Abs
// set the status to 500 and set the errorException.
// If we fail here, then the response is likely already
// committed, so we can't try and set headers.
- if(keepAlive && !getErrorState().isError() && (
- response.getErrorException() != null ||
- (!isAsync() &&
-
statusDropsConnection(response.getStatus())))) {
+ if(keepAlive && !getErrorState().isError() && !isAsync() &&
+ statusDropsConnection(response.getStatus())) {
setErrorState(ErrorState.CLOSE_CLEAN, null);
}
} catch (InterruptedIOException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
