Author: markt
Date: Thu Jan 15 11:12:34 2015
New Revision: 1652055
URL: http://svn.apache.org/r1652055
Log:
Reduce duplication in HttpProcessor implementation constructors
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1652055&r1=1652054&r2=1652055&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Thu
Jan 15 11:12:34 2015
@@ -227,9 +227,19 @@ public abstract class AbstractHttp11Proc
protected HttpUpgradeHandler httpUpgradeHandler = null;
- public AbstractHttp11Processor(AbstractEndpoint<S> endpoint) {
+ public AbstractHttp11Processor(int maxHttpHeaderSize, AbstractEndpoint<S>
endpoint,
+ int maxTrailerSize, int maxExtensionSize, int maxSwallowSize) {
+
super(endpoint);
userDataHelper = new UserDataHelper(getLog());
+
+ inputBuffer = new Http11InputBuffer(request, maxHttpHeaderSize);
+ request.setInputBuffer(getInputBuffer());
+
+ outputBuffer = new Http11OutputBuffer(response, maxHttpHeaderSize);
+ response.setOutputBuffer(getOutputBuffer());
+
+ initializeFilters(maxTrailerSize, maxExtensionSize, maxSwallowSize);
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1652055&r1=1652054&r2=1652055&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Thu Jan
15 11:12:34 2015
@@ -50,21 +50,13 @@ public class Http11AprProcessor extends
return log;
}
- // ----------------------------------------------------------- Constructors
+ // ----------------------------------------------------------- Constructors
- public Http11AprProcessor(int headerBufferSize, AbstractEndpoint<Long>
endpoint,
+ public Http11AprProcessor(int maxHttpHeaderSize, AbstractEndpoint<Long>
endpoint,
int maxTrailerSize, int maxExtensionSize, int maxSwallowSize) {
- super(endpoint);
-
- inputBuffer = new Http11InputBuffer(request, headerBufferSize);
- request.setInputBuffer(getInputBuffer());
-
- outputBuffer = new Http11OutputBuffer(response, headerBufferSize);
- response.setOutputBuffer(getOutputBuffer());
-
- initializeFilters(maxTrailerSize, maxExtensionSize, maxSwallowSize);
+ super(maxHttpHeaderSize, endpoint, maxTrailerSize, maxExtensionSize,
maxSwallowSize);
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java?rev=1652055&r1=1652054&r2=1652055&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java Thu Jan
15 11:12:34 2015
@@ -54,21 +54,13 @@ public class Http11Nio2Processor extends
*/
protected SSLSupport sslSupport;
- // ----------------------------------------------------------- Constructors
+ // ----------------------------------------------------------- Constructors
public Http11Nio2Processor(int maxHttpHeaderSize,
AbstractEndpoint<Nio2Channel> endpoint,
int maxTrailerSize, int maxExtensionSize, int maxSwallowSize) {
- super(endpoint);
-
- inputBuffer = new Http11InputBuffer(request, maxHttpHeaderSize);
- request.setInputBuffer(getInputBuffer());
-
- outputBuffer = new Http11OutputBuffer(response, maxHttpHeaderSize);
- response.setOutputBuffer(getOutputBuffer());
-
- initializeFilters(maxTrailerSize, maxExtensionSize, maxSwallowSize);
+ super(maxHttpHeaderSize, endpoint, maxTrailerSize, maxExtensionSize,
maxSwallowSize);
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1652055&r1=1652054&r2=1652055&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Thu Jan
15 11:12:34 2015
@@ -55,21 +55,13 @@ public class Http11NioProcessor extends
*/
protected SSLSupport sslSupport;
- // ----------------------------------------------------------- Constructors
+ // ----------------------------------------------------------- Constructors
public Http11NioProcessor(int maxHttpHeaderSize,
AbstractEndpoint<NioChannel> endpoint,
int maxTrailerSize, int maxExtensionSize, int maxSwallowSize) {
- super(endpoint);
-
- inputBuffer = new Http11InputBuffer(request, maxHttpHeaderSize);
- request.setInputBuffer(getInputBuffer());
-
- outputBuffer = new Http11OutputBuffer(response, maxHttpHeaderSize);
- response.setOutputBuffer(getOutputBuffer());
-
- initializeFilters(maxTrailerSize, maxExtensionSize, maxSwallowSize);
+ super(maxHttpHeaderSize, endpoint, maxTrailerSize, maxExtensionSize,
maxSwallowSize);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
