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

diff --git a/java/org/apache/coyote/http11/AbstractHttp11Processor.java b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
index 1543438..4ae083a 100644 (file)
--- 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 720c556..89a2a85 100644 (file)
--- 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 48e89e4..27e56ad 100644 (file)
--- 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 cee58bd..55efad7 100644 (file)
--- 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