From 462c58e934f08fb06c234a41ca3759044d38d0a8 Mon Sep 17 00:00:00 2001 From: markt Date: Wed, 15 Jun 2011 15:56:59 +0000 Subject: [PATCH] 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 --- java/org/apache/coyote/ajp/AjpProcessor.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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 -- 2.11.0