Pull up release()

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1682167 13f79535-47bb-0310-9956-ffa450edef68
apache · May 28, 2015 · a459ef8 · a459ef8
1 parent 0598f7e
commit a459ef8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 34 deletions.
diff --git a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
@@ -627,5 +627,16 @@ protected Processor createUpgradeProcessor(
                 return new UpgradeProcessorExternal(socket, leftoverInput, httpUpgradeHandler);
             }
         }
+
+
+        @Override
+        public void release(SocketWrapperBase<S> socket,
+                Processor processor, boolean addToPoller) {
+            processor.recycle();
+            recycledProcessors.push(processor);
+            if (addToPoller) {
+                socket.registerReadInterest();
+            }
+        }
     }
 }
diff --git a/java/org/apache/coyote/http11/Http11AprProtocol.java b/java/org/apache/coyote/http11/Http11AprProtocol.java
@@ -16,11 +16,9 @@
  */
 package org.apache.coyote.http11;
 
-import org.apache.coyote.Processor;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.net.AprEndpoint;
-import org.apache.tomcat.util.net.SocketWrapperBase;
 
 
 /**
@@ -94,15 +92,5 @@ protected static class Http11ConnectionHandler
         protected Log getLog() {
             return log;
         }
-
-        @Override
-        public void release(SocketWrapperBase<Long> socket,
-                Processor processor, boolean addToPoller) {
-            processor.recycle();
-            recycledProcessors.push(processor);
-            if (addToPoller) {
-                socket.registerReadInterest();
-            }
-        }
     }
 }
diff --git a/java/org/apache/coyote/http11/Http11Nio2Protocol.java b/java/org/apache/coyote/http11/Http11Nio2Protocol.java
@@ -89,17 +89,6 @@ public void release(SocketWrapperBase<Nio2Channel> socket) {
         }
 
 
-        @Override
-        public void release(SocketWrapperBase<Nio2Channel> socket,
-                Processor processor, boolean addToPoller) {
-            processor.recycle();
-            recycledProcessors.push(processor);
-            if (addToPoller) {
-                socket.registerReadInterest();
-            }
-        }
-
-
         @Override
         public void closeAll() {
             for (Nio2Channel channel : connections.keySet()) {

diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -145,16 +145,5 @@ public void release(SocketWrapperBase<NioChannel> socket) {
                 recycledProcessors.push(processor);
             }
         }
-
-
-        @Override
-        public void release(SocketWrapperBase<NioChannel> socket,
-                Processor processor, boolean addToPoller) {
-            processor.recycle();
-            recycledProcessors.push(processor);
-            if (addToPoller) {
-                socket.registerReadInterest();
-            }
-        }
     }
 }