You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/06/15 17:56:59 UTC

svn commit: r1136099 - /tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java

Author: markt
Date: Wed Jun 15 15:56:59 2011
New Revision: 1136099

URL: http://svn.apache.org/viewvc?rev=1136099&view=rev
Log:
Align code between connectors in preparation for pulling code up to the superclass
When returning SocketState.CLOSED, recycle is always called

Modified:
    tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1136099&r1=1136098&r2=1136099&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Wed Jun 15 15:56:59 2011
@@ -364,23 +364,24 @@ public class AjpProcessor extends Abstra
         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
 
 



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