Author: markt
Date: Thu May 28 08:23:01 2015
New Revision: 1682167
URL: http://svn.apache.org/r1682167
Log:
Pull up release()
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1682167&r1=1682166&r2=1682167&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Thu
May 28 08:23:01 2015
@@ -627,5 +627,16 @@ public abstract class AbstractHttp11Prot
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();
+ }
+ }
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1682167&r1=1682166&r2=1682167&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Thu May
28 08:23:01 2015
@@ -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 @@ public class Http11AprProtocol extends A
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();
- }
- }
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1682167&r1=1682166&r2=1682167&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Thu May
28 08:23:01 2015
@@ -90,17 +90,6 @@ public class Http11Nio2Protocol extends
@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()) {
((Nio2Endpoint)
getProtocol().getEndpoint()).closeSocket(channel.getSocket());
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1682167&r1=1682166&r2=1682167&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Thu May
28 08:23:01 2015
@@ -145,16 +145,5 @@ public class Http11NioProtocol extends A
recycledProcessors.push(processor);
}
}
-
-
- @Override
- public void release(SocketWrapperBase<NioChannel> socket,
- Processor processor, boolean addToPoller) {
- processor.recycle();
- recycledProcessors.push(processor);
- if (addToPoller) {
- socket.registerReadInterest();
- }
- }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
