tomcat-dev mailing list archives

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

URL: http://svn.apache.org/viewvc?rev=1144048&view=rev
Log:
Remove unnecessary throws
Move timeout lookups to where the timeouts are reset (in preparation for this being in a separate
method)

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=1144048&r1=1144047&r2=1144048&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:22:01
2011
@@ -177,14 +177,8 @@ public class Http11NioProcessor extends 
     /**
      * Process pipelined HTTP requests using the specified input and output
      * streams.
-     *
-     * @throws IOException error during an I/O operation
      */
-    public SocketState asyncDispatch(SocketStatus status)
-        throws IOException {
-
-        long soTimeout = endpoint.getSoTimeout();
-        int keepAliveTimeout = endpoint.getKeepAliveTimeout();
+    public SocketState asyncDispatch(SocketStatus status) {
 
         RequestInfo rp = request.getRequestProcessor();
         final NioEndpoint.KeyAttachment attach = (NioEndpoint.KeyAttachment)socket.getAttachment(false);
@@ -193,6 +187,9 @@ public class Http11NioProcessor extends 
             error = !adapter.asyncDispatch(request, response, status);
             if (!error && attach != null &&
                     asyncStateMachine.isAsyncDispatching()) {
+                long soTimeout = endpoint.getSoTimeout();
+                int keepAliveTimeout = endpoint.getKeepAliveTimeout();
+
                 //reset the timeout
                 if (keepAlive && keepAliveTimeout>0) {
                     attach.setTimeout(keepAliveTimeout);



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


Mime
View raw message