From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 7 Jul 2011 21:22:01 +0000 (+0000)
Subject: Remove unnecessary throws
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=802f449c4da6706c9e79164e5b76d37fcbeef175;p=tomcat7.0

Remove unnecessary throws
Move timeout lookups to where the timeouts are reset (in preparation for this being in a separate method)

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

diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java
index a4b70126b..e8c7687f8 100644
--- a/java/org/apache/coyote/http11/Http11NioProcessor.java
+++ b/java/org/apache/coyote/http11/Http11NioProcessor.java
@@ -177,14 +177,8 @@ public class Http11NioProcessor extends AbstractHttp11Processor {
     /**
      * 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 AbstractHttp11Processor {
             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);