From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 5 Sep 2011 11:55:31 +0000 (+0000)
Subject: Remove unnecessary try/catch
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=fd5db3c95524e9f551a74a7e5e76b044688dfd6a;p=tomcat7.0

Remove unnecessary try/catch
The methods it contained were either simple setters or already provided exactly the same exception handling

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

diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java
index b1acb0c1c..e19c9df03 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -283,24 +283,18 @@ public class Http11Processor extends AbstractHttp11Processor<Socket> {
             }
 
             // Finish the handling of the request
-            try {
-                rp.setStage(org.apache.coyote.Constants.STAGE_ENDINPUT);
-                // If we know we are closing the connection, don't drain input.
-                // This way uploading a 100GB file doesn't tie up the thread 
-                // if the servlet has rejected it.
-                
-                if(error && !isAsync())
-                    inputBuffer.setSwallowInput(false);
-                if (!isAsync())
-                    endRequest();
-            } catch (Throwable t) {
-                ExceptionUtils.handleThrowable(t);
-                log.error(sm.getString("http11processor.request.finish"), t);
-                // 500 - Internal Server Error
-                response.setStatus(500);
-                adapter.log(request, response, 0);
-                error = true;
+            rp.setStage(org.apache.coyote.Constants.STAGE_ENDINPUT);
+            
+            if(error && !isAsync()) {
+                // If we know we are closing the connection, don't drain
+                // input. This way uploading a 100GB file doesn't tie up the
+                // thread if the servlet has rejected it.
+                inputBuffer.setSwallowInput(false);
             }
+
+            if (!isAsync())
+                endRequest();
+
             try {
                 rp.setStage(org.apache.coyote.Constants.STAGE_ENDOUTPUT);
             } catch (Throwable t) {