From 373204f355716800e11eb69089a5db7536e81e7e Mon Sep 17 00:00:00 2001 From: markt Date: Sun, 19 Jun 2011 10:53:00 +0000 Subject: [PATCH] Start to pull up common code from constructors git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1137335 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/ajp/AbstractAjpProcessor.java | 20 ++++++++++++++++++++ java/org/apache/coyote/ajp/AjpAprProcessor.java | 13 +------------ java/org/apache/coyote/ajp/AjpNioProcessor.java | 13 +------------ java/org/apache/coyote/ajp/AjpProcessor.java | 13 +------------ 4 files changed, 23 insertions(+), 36 deletions(-) diff --git a/java/org/apache/coyote/ajp/AbstractAjpProcessor.java b/java/org/apache/coyote/ajp/AbstractAjpProcessor.java index 53f97709a..17061c11c 100644 --- a/java/org/apache/coyote/ajp/AbstractAjpProcessor.java +++ b/java/org/apache/coyote/ajp/AbstractAjpProcessor.java @@ -34,6 +34,7 @@ import org.apache.coyote.AsyncStateMachine; import org.apache.coyote.InputBuffer; import org.apache.coyote.Request; import org.apache.coyote.RequestInfo; +import org.apache.coyote.Response; import org.apache.juli.logging.Log; import org.apache.tomcat.util.ExceptionUtils; import org.apache.tomcat.util.buf.ByteChunk; @@ -41,6 +42,7 @@ import org.apache.tomcat.util.buf.HexUtils; import org.apache.tomcat.util.buf.MessageBytes; import org.apache.tomcat.util.http.HttpMessages; import org.apache.tomcat.util.http.MimeHeaders; +import org.apache.tomcat.util.net.AbstractEndpoint; import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState; import org.apache.tomcat.util.net.SSLSupport; import org.apache.tomcat.util.net.SocketStatus; @@ -219,6 +221,24 @@ public abstract class AbstractAjpProcessor extends AbstractProcessor { protected long byteCount = 0; + // ------------------------------------------------------------ Constructor + + public AbstractAjpProcessor(int packetSize, AbstractEndpoint endpoint) { + this.packetSize = packetSize; + this.endpoint = endpoint; + + request = new Request(); + request.setInputBuffer(new SocketInputBuffer()); + + response = new Response(); + request.setResponse(response); + + requestHeaderMessage = new AjpMessage(packetSize); + responseHeaderMessage = new AjpMessage(packetSize); + bodyMessage = new AjpMessage(packetSize); + } + + // ------------------------------------------------------------- Properties diff --git a/java/org/apache/coyote/ajp/AjpAprProcessor.java b/java/org/apache/coyote/ajp/AjpAprProcessor.java index 732abc632..b75a6e823 100644 --- a/java/org/apache/coyote/ajp/AjpAprProcessor.java +++ b/java/org/apache/coyote/ajp/AjpAprProcessor.java @@ -23,7 +23,6 @@ import java.nio.ByteBuffer; import org.apache.coyote.ActionCode; import org.apache.coyote.OutputBuffer; -import org.apache.coyote.Request; import org.apache.coyote.RequestInfo; import org.apache.coyote.Response; import org.apache.juli.logging.Log; @@ -69,20 +68,10 @@ public class AjpAprProcessor extends AbstractAjpProcessor { public AjpAprProcessor(int packetSize, AprEndpoint endpoint) { - this.endpoint = endpoint; + super(packetSize, endpoint); - request = new Request(); - request.setInputBuffer(new SocketInputBuffer()); - - response = new Response(); response.setHook(this); response.setOutputBuffer(new SocketOutputBuffer()); - request.setResponse(response); - - this.packetSize = packetSize; - requestHeaderMessage = new AjpMessage(packetSize); - responseHeaderMessage = new AjpMessage(packetSize); - bodyMessage = new AjpMessage(packetSize); // Set the get body message buffer AjpMessage getBodyMessage = new AjpMessage(16); diff --git a/java/org/apache/coyote/ajp/AjpNioProcessor.java b/java/org/apache/coyote/ajp/AjpNioProcessor.java index e7ab8a28d..0a9e16e9c 100644 --- a/java/org/apache/coyote/ajp/AjpNioProcessor.java +++ b/java/org/apache/coyote/ajp/AjpNioProcessor.java @@ -25,7 +25,6 @@ import java.nio.channels.Selector; import org.apache.coyote.ActionCode; import org.apache.coyote.OutputBuffer; -import org.apache.coyote.Request; import org.apache.coyote.RequestInfo; import org.apache.coyote.Response; import org.apache.juli.logging.Log; @@ -62,23 +61,13 @@ public class AjpNioProcessor extends AbstractAjpProcessor { public AjpNioProcessor(int packetSize, NioEndpoint endpoint) { - this.endpoint = endpoint; + super(packetSize, endpoint); - request = new Request(); - request.setInputBuffer(new SocketInputBuffer()); - - response = new Response(); response.setHook(this); response.setOutputBuffer(new SocketOutputBuffer()); - request.setResponse(response); pool = endpoint.getSelectorPool(); - this.packetSize = packetSize; - requestHeaderMessage = new AjpMessage(packetSize); - responseHeaderMessage = new AjpMessage(packetSize); - bodyMessage = new AjpMessage(packetSize); - // Set the get body message buffer AjpMessage getBodyMessage = new AjpMessage(16); getBodyMessage.reset(); diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java b/java/org/apache/coyote/ajp/AjpProcessor.java index 3080e9594..0b1a8704b 100644 --- a/java/org/apache/coyote/ajp/AjpProcessor.java +++ b/java/org/apache/coyote/ajp/AjpProcessor.java @@ -25,7 +25,6 @@ import java.net.Socket; import org.apache.coyote.ActionCode; import org.apache.coyote.OutputBuffer; -import org.apache.coyote.Request; import org.apache.coyote.RequestInfo; import org.apache.coyote.Response; import org.apache.juli.logging.Log; @@ -68,20 +67,10 @@ public class AjpProcessor extends AbstractAjpProcessor { public AjpProcessor(int packetSize, JIoEndpoint endpoint) { - this.endpoint = endpoint; + super(packetSize, endpoint); - request = new Request(); - request.setInputBuffer(new SocketInputBuffer()); - - response = new Response(); response.setHook(this); response.setOutputBuffer(new SocketOutputBuffer()); - request.setResponse(response); - - this.packetSize = packetSize; - requestHeaderMessage = new AjpMessage(packetSize); - responseHeaderMessage = new AjpMessage(packetSize); - bodyMessage = new AjpMessage(packetSize); // Set the get body message buffer AjpMessage getBodyMessage = new AjpMessage(16); -- 2.11.0