From b3f4ce0524d0a92f38962a9665d8b3879073447d Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 14 Sep 2010 11:47:57 +0000 Subject: [PATCH] More re-factoring prior to large async changes git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@996852 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/http11/AbstractHttp11Processor.java | 8 ++++++++ java/org/apache/coyote/http11/Http11AprProcessor.java | 7 +++---- java/org/apache/coyote/http11/Http11NioProcessor.java | 5 ++--- java/org/apache/coyote/http11/Http11Processor.java | 5 ++--- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/java/org/apache/coyote/http11/AbstractHttp11Processor.java b/java/org/apache/coyote/http11/AbstractHttp11Processor.java index 154343852..4ae083a87 100644 --- a/java/org/apache/coyote/http11/AbstractHttp11Processor.java +++ b/java/org/apache/coyote/http11/AbstractHttp11Processor.java @@ -1081,4 +1081,12 @@ public abstract class AbstractHttp11Processor { } } + + public final void recycle() { + getInputBuffer().recycle(); + getOutputBuffer().recycle(); + recycleInternal(); + } + + protected abstract void recycleInternal(); } diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java index 720c55614..89a2a8539 100644 --- a/java/org/apache/coyote/http11/Http11AprProcessor.java +++ b/java/org/apache/coyote/http11/Http11AprProcessor.java @@ -391,10 +391,9 @@ public class Http11AprProcessor extends AbstractHttp11Processor implements Actio } - - public void recycle() { - inputBuffer.recycle(); - outputBuffer.recycle(); + + @Override + public void recycleInternal() { this.socket = 0; } diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java index 48e89e485..27e56ad3c 100644 --- a/java/org/apache/coyote/http11/Http11NioProcessor.java +++ b/java/org/apache/coyote/http11/Http11NioProcessor.java @@ -465,9 +465,8 @@ public class Http11NioProcessor extends AbstractHttp11Processor implements Actio } - public void recycle() { - inputBuffer.recycle(); - outputBuffer.recycle(); + @Override + public void recycleInternal() { this.socket = null; this.cometClose = false; this.comet = false; diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java index cee58bdea..55efad7ca 100644 --- a/java/org/apache/coyote/http11/Http11Processor.java +++ b/java/org/apache/coyote/http11/Http11Processor.java @@ -361,10 +361,9 @@ public class Http11Processor extends AbstractHttp11Processor implements ActionHo } - public void recycle() { + @Override + protected void recycleInternal() { // Recycle - inputBuffer.recycle(); - outputBuffer.recycle(); this.socket = null; async = false; // Recycle ssl info -- 2.11.0