Author: markt Date: Fri Jan 30 14:22:51 2015 New Revision: 1656020 URL: http://svn.apache.org/r1656020 Log: Insert an AbstractHttp11ConnectionHandler to mirror AJP and facilitate pulling up code common to all HTTP handlers.
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=1656020&r1=1656019&r2=1656020&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Fri Jan 30 14:22:51 2015 @@ -17,6 +17,7 @@ package org.apache.coyote.http11; import org.apache.coyote.AbstractProtocol; + import org.apache.tomcat.util.net.AbstractEndpoint; public abstract class AbstractHttp11Protocol<S> extends AbstractProtocol<S> { @@ -228,4 +229,10 @@ public abstract class AbstractHttp11Prot processor.setServer(getServer()); processor.setClientCertProvider(getClientCertProvider()); } + + + protected abstract static class AbstractHttp11ConnectionHandler<S> + extends AbstractConnectionHandler<S,Http11Processor> { + + } } 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=1656020&r1=1656019&r2=1656020&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Fri Jan 30 14:22:51 2015 @@ -212,7 +212,7 @@ public class Http11AprProtocol extends A // -------------------- Connection handler -------------------- protected static class Http11ConnectionHandler - extends AbstractConnectionHandler<Long,Http11Processor> { + extends AbstractHttp11ConnectionHandler<Long> { protected Http11AprProtocol proto; 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=1656020&r1=1656019&r2=1656020&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Fri Jan 30 14:22:51 2015 @@ -100,7 +100,7 @@ public class Http11Nio2Protocol extends // -------------------- Connection handler -------------------- protected static class Http11ConnectionHandler - extends AbstractConnectionHandler<Nio2Channel,Http11Processor> + extends AbstractHttp11ConnectionHandler<Nio2Channel> implements Handler { protected Http11Nio2Protocol proto; 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=1656020&r1=1656019&r2=1656020&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Fri Jan 30 14:22:51 2015 @@ -127,7 +127,7 @@ public class Http11NioProtocol extends A // -------------------- Connection handler -------------------- protected static class Http11ConnectionHandler - extends AbstractConnectionHandler<NioChannel,Http11Processor> + extends AbstractHttp11ConnectionHandler<NioChannel> implements Handler { protected Http11NioProtocol proto; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org