Collapse the multiple if statements

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1144046 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java
index 31b6f47..a4b7012 100644 (file)
--- a/java/org/apache/coyote/http11/Http11NioProcessor.java
+++ b/java/org/apache/coyote/http11/Http11NioProcessor.java
@@ -191,16 +191,13 @@ public class Http11NioProcessor extends AbstractHttp11Processor {
         try {
             rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE);
             error = !adapter.asyncDispatch(request, response, status);
-            if ( !error ) {
-                if (attach != null) {
-                    if (asyncStateMachine.isAsyncDispatching()) {
-                        //reset the timeout
-                        if (keepAlive && keepAliveTimeout>0) {
-                            attach.setTimeout(keepAliveTimeout);
-                        } else {
-                            attach.setTimeout(soTimeout);
-                        }
-                    }
+            if (!error && attach != null &&
+                    asyncStateMachine.isAsyncDispatching()) {
+                //reset the timeout
+                if (keepAlive && keepAliveTimeout>0) {
+                    attach.setTimeout(keepAliveTimeout);
+                } else {
+                    attach.setTimeout(soTimeout);
                 }
             }
         } catch (InterruptedIOException e) {