Author: markt
Date: Thu May 28 09:45:03 2015
New Revision: 1682190
URL: http://svn.apache.org/r1682190
Log:
Pull up release() to base Protocol class
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1682190&r1=1682189&r2=1682190&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Thu May 28
09:45:03 2015
@@ -859,12 +859,20 @@ public abstract class AbstractProtocol<S
* @param addToPoller Should the socket be added to the poller for
* reading
*/
- protected abstract void release(SocketWrapperBase<S> socket,
- Processor processor, boolean addToPoller);
+ public void release(SocketWrapperBase<S> socket, Processor processor,
boolean addToPoller) {
+ processor.recycle();
+ recycledProcessors.push(processor);
+ if (addToPoller) {
+ socket.registerReadInterest();
+ }
+ }
+
+
protected abstract Processor createUpgradeProcessor(
SocketWrapperBase<?> socket, ByteBuffer leftoverInput,
HttpUpgradeHandler httpUpgradeHandler) throws IOException;
+
protected void register(AbstractProcessor processor) {
if (getProtocol().getDomain() != null) {
synchronized (this) {
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1682190&r1=1682189&r2=1682190&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Thu May 28
09:45:03 2015
@@ -21,7 +21,6 @@ import java.nio.ByteBuffer;
import javax.servlet.http.HttpUpgradeHandler;
import org.apache.coyote.AbstractProtocol;
-import org.apache.coyote.Processor;
import org.apache.coyote.UpgradeProtocol;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.SSLHostConfig;
@@ -175,17 +174,5 @@ public abstract class AbstractAjpProtoco
// TODO should fail - throw IOE
return null;
}
-
-
-
- @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/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1682190&r1=1682189&r2=1682190&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Thu
May 28 09:45:03 2015
@@ -627,16 +627,5 @@ 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();
- }
- }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
