Author: markt
Date: Sun Nov 8 16:53:31 2015
New Revision: 1713257
URL: http://svn.apache.org/viewvc?rev=1713257&view=rev
Log:
ConnectionHandler is independent of ProcessorType
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=1713257&r1=1713256&r2=1713257&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Sun Nov 8
16:53:31 2015
@@ -657,7 +657,7 @@ public abstract class AbstractProtocol<S
// ------------------------------------------- Connection handler base
class
- protected static class ConnectionHandler<S,P extends Processor>
+ protected static class ConnectionHandler<S>
implements AbstractEndpoint.Handler<S> {
private final AbstractProtocol<S> proto;
@@ -668,7 +668,7 @@ public abstract class AbstractProtocol<S
protected final ConcurrentHashMap<S,Processor> connections =
new ConcurrentHashMap<>();
- protected final RecycledProcessors<P,S> recycledProcessors =
+ protected final RecycledProcessors<S> recycledProcessors =
new RecycledProcessors<>(this);
public ConnectionHandler(AbstractProtocol<S> proto) {
@@ -1015,13 +1015,12 @@ public abstract class AbstractProtocol<S
}
}
- protected static class RecycledProcessors<P extends Processor, S>
- extends SynchronizedStack<Processor> {
+ protected static class RecycledProcessors<S> extends
SynchronizedStack<Processor> {
- private final transient ConnectionHandler<S,P> handler;
+ private final transient ConnectionHandler<S> handler;
protected final AtomicInteger size = new AtomicInteger(0);
- public RecycledProcessors(ConnectionHandler<S,P> handler) {
+ public RecycledProcessors(ConnectionHandler<S> handler) {
this.handler = handler;
}
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=1713257&r1=1713256&r2=1713257&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Sun Nov 8
16:53:31 2015
@@ -48,7 +48,7 @@ public abstract class AbstractAjpProtoco
setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
// AJP does not use Send File
getEndpoint().setUseSendfile(false);
- ConnectionHandler<S,AjpProcessor> cHandler = new
ConnectionHandler<>(this);
+ ConnectionHandler<S> cHandler = new ConnectionHandler<>(this);
setHandler(cHandler);
getEndpoint().setHandler(cHandler);
}
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=1713257&r1=1713256&r2=1713257&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Sun
Nov 8 16:53:31 2015
@@ -52,7 +52,7 @@ public abstract class AbstractHttp11Prot
public AbstractHttp11Protocol(AbstractEndpoint<S> endpoint) {
super(endpoint);
setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
- ConnectionHandler<S,Http11Processor> cHandler = new
ConnectionHandler<>(this);
+ ConnectionHandler<S> cHandler = new ConnectionHandler<>(this);
setHandler(cHandler);
getEndpoint().setHandler(cHandler);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
