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 777ea58..c9763a0 100644 (file)
--- 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