Author: markt
Date: Sun Nov 8 16:53:06 2015
New Revision: 1713252
URL: http://svn.apache.org/viewvc?rev=1713252&view=rev
Log:
Pull up creation of Handler
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
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/ajp/AbstractAjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1713252&r1=1713251&r2=1713252&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:06 2015
@@ -48,6 +48,9 @@ public abstract class AbstractAjpProtoco
setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
// AJP does not use Send File
getEndpoint().setUseSendfile(false);
+ AjpConnectionHandler<S> cHandler = new AjpConnectionHandler<>(this);
+ setHandler(cHandler);
+ getEndpoint().setHandler(cHandler);
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1713252&r1=1713251&r2=1713252&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Sun Nov 8
16:53:06 2015
@@ -44,9 +44,6 @@ public class AjpAprProtocol extends Abst
public AjpAprProtocol() {
super(new AprEndpoint());
- AjpConnectionHandler<Long> cHandler = new AjpConnectionHandler<>(this);
- setHandler(cHandler);
- ((AprEndpoint) getEndpoint()).setHandler(cHandler);
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java?rev=1713252&r1=1713251&r2=1713252&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java Sun Nov 8
16:53:06 2015
@@ -37,9 +37,6 @@ public class AjpNio2Protocol extends Abs
public AjpNio2Protocol() {
super(new Nio2Endpoint());
- AjpConnectionHandler<Nio2Channel> cHandler = new
AjpConnectionHandler<>(this);
- setHandler(cHandler);
- ((Nio2Endpoint) getEndpoint()).setHandler(cHandler);
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1713252&r1=1713251&r2=1713252&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Sun Nov 8
16:53:06 2015
@@ -36,9 +36,6 @@ public class AjpNioProtocol extends Abst
public AjpNioProtocol() {
super(new NioEndpoint());
- AjpConnectionHandler<NioChannel> cHandler = new
AjpConnectionHandler<>(this);
- setHandler(cHandler);
- ((NioEndpoint) 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=1713252&r1=1713251&r2=1713252&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:06 2015
@@ -53,6 +53,9 @@ public abstract class AbstractHttp11Prot
public AbstractHttp11Protocol(AbstractEndpoint<S> endpoint) {
super(endpoint);
setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
+ Http11ConnectionHandler<S> cHandler = new
Http11ConnectionHandler<>(this);
+ setHandler(cHandler);
+ getEndpoint().setHandler(cHandler);
}
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=1713252&r1=1713251&r2=1713252&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Sun Nov
8 16:53:06 2015
@@ -35,9 +35,6 @@ public class Http11AprProtocol extends A
public Http11AprProtocol() {
super(new AprEndpoint());
- Http11ConnectionHandler<Long> cHandler = new
Http11ConnectionHandler<>(this);
- setHandler(cHandler);
- getEndpoint().setHandler(cHandler);
}
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=1713252&r1=1713251&r2=1713252&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Sun Nov
8 16:53:06 2015
@@ -32,9 +32,6 @@ public class Http11Nio2Protocol extends
public Http11Nio2Protocol() {
super(new Nio2Endpoint());
- Http11ConnectionHandler<Nio2Channel> cHandler = new
Http11ConnectionHandler<>(this);
- setHandler(cHandler);
- getEndpoint().setHandler(cHandler);
}
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=1713252&r1=1713251&r2=1713252&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Sun Nov
8 16:53:06 2015
@@ -37,9 +37,6 @@ public class Http11NioProtocol extends A
public Http11NioProtocol() {
super(new NioEndpoint());
- Http11ConnectionHandler<NioChannel> cHandler = new
Http11ConnectionHandler<>(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
