From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 15 Jun 2011 15:56:59 +0000 (+0000)
Subject: Align code between connectors in preparation for pulling code up to the superclass
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=462c58e934f08fb06c234a41ca3759044d38d0a8;p=tomcat7.0

Align code between connectors in preparation for pulling code up to the superclass
When returning SocketState.CLOSED, recycle is always called

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

diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java b/java/org/apache/coyote/ajp/AjpProcessor.java
index 777ea5855..c9763a005 100644
--- a/java/org/apache/coyote/ajp/AjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpProcessor.java
@@ -364,23 +364,24 @@ public class AjpProcessor extends AbstractAjpProcessor {
         if (isAsync()) {
             if (error) {
                 request.updateCounters();
-                input = null;
-                output = null;
                 return SocketState.CLOSED;
             } else {
                 return SocketState.LONG;
             }
         } else {
             request.updateCounters();
-            input = null;
-            output = null;
             return SocketState.CLOSED;
         }
-
-
     }
 
     
+    @Override
+    public void recycle() {
+        super.recycle();
+        input = null;
+        output = null;
+    }
+
     // ----------------------------------------------------- ActionHook Methods