Author: markt
Date: Mon Sep 28 20:56:15 2015
New Revision: 1705775
URL: http://svn.apache.org/viewvc?rev=1705775&view=rev
Log:
Simplify
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1705775&r1=1705774&r2=1705775&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Mon Sep 28
20:56:15 2015
@@ -669,24 +669,18 @@ public class AjpProcessor extends Abstra
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
- if (isAsync()) {
- if (getErrorState().isError()) {
- request.updateCounters();
- return SocketState.CLOSED;
- } else {
- return SocketState.LONG;
- }
+ if (getErrorState().isError()) {
+ request.updateCounters();
+ return SocketState.CLOSED;
+ } else if (isAsync()) {
+ return SocketState.LONG;
} else {
// Set keep alive timeout for next request if enabled
if (keepAliveTimeout > 0) {
socketWrapper.setReadTimeout(keepAliveTimeout);
}
request.updateCounters();
- if (getErrorState().isError()) {
- return SocketState.CLOSED;
- } else {
- return SocketState.OPEN;
- }
+ return SocketState.OPEN;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
