From 7fcadb7b0f7d0c316dd9ca0d52fd1eb2a06d19cc Mon Sep 17 00:00:00 2001 From: markt Date: Wed, 8 Dec 2010 13:37:11 +0000 Subject: [PATCH] Re-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360 Align the init() methods (JSSE still to go) git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1043410 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/ajp/AjpAprProtocol.java | 4 ++-- java/org/apache/coyote/ajp/AjpProtocol.java | 2 +- java/org/apache/coyote/ajp/Constants.java | 1 + java/org/apache/coyote/http11/Http11AprProtocol.java | 4 ++-- java/org/apache/coyote/http11/Http11NioProtocol.java | 4 ++-- java/org/apache/coyote/http11/Http11Protocol.java | 4 ++-- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/java/org/apache/coyote/ajp/AjpAprProtocol.java b/java/org/apache/coyote/ajp/AjpAprProtocol.java index 241a50d5d..1ff933bc8 100644 --- a/java/org/apache/coyote/ajp/AjpAprProtocol.java +++ b/java/org/apache/coyote/ajp/AjpAprProtocol.java @@ -66,9 +66,11 @@ public class AjpAprProtocol extends AbstractAjpProtocol { public AjpAprProtocol() { endpoint = new AprEndpoint(); cHandler = new AjpConnectionHandler(this); + ((AprEndpoint) endpoint).setHandler(cHandler); setSoLinger(Constants.DEFAULT_CONNECTION_LINGER); setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT); setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY); + setUseSendfile(Constants.DEFAULT_USE_SENDFILE); } @@ -89,8 +91,6 @@ public class AjpAprProtocol extends AbstractAjpProtocol { @Override public void init() throws Exception { endpoint.setName(getName()); - ((AprEndpoint)endpoint).setHandler(cHandler); - ((AprEndpoint)endpoint).setUseSendfile(false); try { endpoint.init(); diff --git a/java/org/apache/coyote/ajp/AjpProtocol.java b/java/org/apache/coyote/ajp/AjpProtocol.java index da8a3dc74..3c1332600 100644 --- a/java/org/apache/coyote/ajp/AjpProtocol.java +++ b/java/org/apache/coyote/ajp/AjpProtocol.java @@ -67,6 +67,7 @@ public class AjpProtocol extends AbstractAjpProtocol { public AjpProtocol() { endpoint = new JIoEndpoint(); cHandler = new AjpConnectionHandler(this); + ((JIoEndpoint) endpoint).setHandler(cHandler); setSoLinger(Constants.DEFAULT_CONNECTION_LINGER); setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT); setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY); @@ -90,7 +91,6 @@ public class AjpProtocol extends AbstractAjpProtocol { @Override public void init() throws Exception { endpoint.setName(getName()); - ((JIoEndpoint)endpoint).setHandler(cHandler); try { endpoint.init(); diff --git a/java/org/apache/coyote/ajp/Constants.java b/java/org/apache/coyote/ajp/Constants.java index 7e2313e9f..b73157ef6 100644 --- a/java/org/apache/coyote/ajp/Constants.java +++ b/java/org/apache/coyote/ajp/Constants.java @@ -42,6 +42,7 @@ public final class Constants { public static final int DEFAULT_CONNECTION_TIMEOUT = -1; public static final int DEFAULT_CONNECTION_UPLOAD_TIMEOUT = 300000; public static final boolean DEFAULT_TCP_NO_DELAY = true; + public static final boolean DEFAULT_USE_SENDFILE = false; // Prefix codes for message types from server to container public static final byte JK_AJP13_FORWARD_REQUEST = 2; diff --git a/java/org/apache/coyote/http11/Http11AprProtocol.java b/java/org/apache/coyote/http11/Http11AprProtocol.java index 4e477f890..8a5b1d4af 100644 --- a/java/org/apache/coyote/http11/Http11AprProtocol.java +++ b/java/org/apache/coyote/http11/Http11AprProtocol.java @@ -72,6 +72,7 @@ public class Http11AprProtocol extends AbstractHttp11Protocol { public Http11AprProtocol() { endpoint = new AprEndpoint(); cHandler = new Http11ConnectionHandler(this); + ((AprEndpoint) endpoint).setHandler(cHandler); setSoLinger(Constants.DEFAULT_CONNECTION_LINGER); setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT); setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY); @@ -83,7 +84,6 @@ public class Http11AprProtocol extends AbstractHttp11Protocol { @Override public void init() throws Exception { endpoint.setName(getName()); - ((AprEndpoint)endpoint).setHandler(cHandler); try { endpoint.init(); @@ -123,7 +123,7 @@ public class Http11AprProtocol extends AbstractHttp11Protocol { log.info(sm.getString("http11protocol.start", getName())); } - private Http11ConnectionHandler cHandler; + private final Http11ConnectionHandler cHandler; public boolean getUseSendfile() { return ((AprEndpoint)endpoint).getUseSendfile(); } public void setUseSendfile(boolean useSendfile) { ((AprEndpoint)endpoint).setUseSendfile(useSendfile); } diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java index 92ea01562..06ce6e15c 100644 --- a/java/org/apache/coyote/http11/Http11NioProtocol.java +++ b/java/org/apache/coyote/http11/Http11NioProtocol.java @@ -68,7 +68,8 @@ public class Http11NioProtocol extends AbstractHttp11JsseProtocol { public Http11NioProtocol() { endpoint=new NioEndpoint(); - cHandler = new Http11ConnectionHandler( this ); + cHandler = new Http11ConnectionHandler(this); + ((NioEndpoint) endpoint).setHandler(cHandler); setSoLinger(Constants.DEFAULT_CONNECTION_LINGER); setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT); setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY); @@ -86,7 +87,6 @@ public class Http11NioProtocol extends AbstractHttp11JsseProtocol { @Override public void init() throws Exception { endpoint.setName(getName()); - ((NioEndpoint)endpoint).setHandler(cHandler); try { endpoint.init(); diff --git a/java/org/apache/coyote/http11/Http11Protocol.java b/java/org/apache/coyote/http11/Http11Protocol.java index 36ae00ec9..b20532985 100644 --- a/java/org/apache/coyote/http11/Http11Protocol.java +++ b/java/org/apache/coyote/http11/Http11Protocol.java @@ -72,6 +72,7 @@ public class Http11Protocol extends AbstractHttp11JsseProtocol { public Http11Protocol() { endpoint = new JIoEndpoint(); cHandler = new Http11ConnectionHandler(this); + ((JIoEndpoint) endpoint).setHandler(cHandler); setSoLinger(Constants.DEFAULT_CONNECTION_LINGER); setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT); setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY); @@ -91,8 +92,7 @@ public class Http11Protocol extends AbstractHttp11JsseProtocol { @Override public void init() throws Exception { - ((JIoEndpoint)endpoint).setName(getName()); - ((JIoEndpoint)endpoint).setHandler(cHandler); + endpoint.setName(getName()); // Verify the validity of the configured socket factory try { -- 2.11.0