tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1144046 - /tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Date Thu, 07 Jul 2011 21:18:11 GMT
Author: markt
Date: Thu Jul  7 21:18:11 2011
New Revision: 1144046

URL: http://svn.apache.org/viewvc?rev=1144046&view=rev
Log:
Collapse the multiple if statements

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1144046&r1=1144045&r2=1144046&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Thu Jul  7 21:18:11
2011
@@ -191,16 +191,13 @@ public class Http11NioProcessor extends 
         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) {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message