Move Processor creation from the ConnectionHandler to the Protocol

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1713254 13f79535-47bb-0310-9956-ffa450edef68

java/org/apache/coyote/AbstractProtocol.java

@@ -419,6 +419,15 @@ protected void setHandler(Handler<S> handler) {
     protected abstract UpgradeProtocol getNegotiatedProtocol(String name);
 
 
+    /**
+     * Create and configure a new Processor instance for the current protocol
+     * implementation.
+     *
+     * @return A fully configured Processor instance that is ready to use
+     */
+    protected abstract Processor createProcessor();
+
+
     // ----------------------------------------------------- JMX related methods
 
     protected String domain;
@@ -722,7 +731,8 @@ public SocketState process(SocketWrapperBase<S> wrapper, SocketStatus status) {
                     processor = recycledProcessors.pop();
                 }
                 if (processor == null) {
-                    processor = createProcessor();
+                    processor = getProtocol().createProcessor();
+                    register(processor);
                 }
 
                 processor.setSslSupport(
@@ -867,8 +877,6 @@ public SocketState process(SocketWrapperBase<S> wrapper, SocketStatus status) {
             return SocketState.CLOSED;
         }
 
-        protected abstract P createProcessor();
-
 
         protected void longPoll(SocketWrapperBase<?> socket, Processor processor) {
             if (!processor.isAsync()) {
@@ -930,7 +938,7 @@ protected abstract Processor createUpgradeProcessor(
                 UpgradeToken upgradeToken) throws IOException;
 
 
-        protected void register(AbstractProcessor processor) {
+        protected void register(Processor processor) {
             if (getProtocol().getDomain() != null) {
                 synchronized (this) {
                     try {

java/org/apache/coyote/ajp/AbstractAjpProtocol.java

@@ -19,6 +19,7 @@
 import java.nio.ByteBuffer;
 
 import org.apache.coyote.AbstractProtocol;
+import org.apache.coyote.Processor;
 import org.apache.coyote.UpgradeProtocol;
 import org.apache.coyote.UpgradeToken;
 import org.apache.tomcat.util.net.AbstractEndpoint;
@@ -155,15 +156,19 @@ public UpgradeProtocol[] findUpgradeProtocols() {
     }
 
 
-    protected void configureProcessor(AjpProcessor processor) {
+    @Override
+    protected Processor createProcessor() {
+        AjpProcessor processor = new AjpProcessor(getPacketSize(), getEndpoint());
         processor.setAdapter(getAdapter());
         processor.setTomcatAuthentication(getTomcatAuthentication());
         processor.setTomcatAuthorization(getTomcatAuthorization());
         processor.setRequiredSecret(requiredSecret);
         processor.setKeepAliveTimeout(getKeepAliveTimeout());
         processor.setClientCertProvider(getClientCertProvider());
+        return processor;
     }
 
+
     protected static class AjpConnectionHandler<S>
             extends AbstractConnectionHandler<S,AjpProcessor> {
 
@@ -179,15 +184,6 @@ protected AbstractAjpProtocol<S> getProtocol() {
         }
 
 
-        @Override
-        protected AjpProcessor createProcessor() {
-            AjpProcessor processor = new AjpProcessor(proto.getPacketSize(), proto.getEndpoint());
-            proto.configureProcessor(processor);
-            register(processor);
-            return processor;
-        }
-
-
         @Override
         protected AjpProcessor createUpgradeProcessor(SocketWrapperBase<?> socket,
                 ByteBuffer leftoverInput, UpgradeToken upgradeToken) {

java/org/apache/coyote/http11/AbstractHttp11Protocol.java

@@ -618,8 +618,11 @@ public void setTrustManagerClassName(String trustManagerClassName) {
 
     // ------------------------------------------------------------- Common code
 
-    // Common configuration required for all new HTTP11 processors
-    protected void configureProcessor(Http11Processor processor) {
+    @Override
+    protected Processor createProcessor() {
+        Http11Processor processor = new Http11Processor(getMaxHttpHeaderSize(), getEndpoint(),
+                getMaxTrailerSize(), allowedTrailerHeaders, getMaxExtensionSize(),
+                getMaxSwallowSize(), httpUpgradeProtocols);
         processor.setAdapter(getAdapter());
         processor.setMaxKeepAliveRequests(getMaxKeepAliveRequests());
         processor.setConnectionUploadTimeout(getConnectionUploadTimeout());
@@ -631,6 +634,7 @@ protected void configureProcessor(Http11Processor processor) {
         processor.setRestrictedUserAgents(getRestrictedUserAgents());
         processor.setMaxSavePostSize(getMaxSavePostSize());
         processor.setServer(getServer());
+        return processor;
     }
 
 
@@ -651,18 +655,6 @@ protected AbstractHttp11Protocol<S> getProtocol() {
         }
 
 
-        @Override
-        public Http11Processor createProcessor() {
-            Http11Processor processor = new Http11Processor(
-                    proto.getMaxHttpHeaderSize(), proto.getEndpoint(), proto.getMaxTrailerSize(),
-                    proto.allowedTrailerHeaders, proto.getMaxExtensionSize(),
-                    proto.getMaxSwallowSize(), proto.httpUpgradeProtocols);
-            proto.configureProcessor(processor);
-            register(processor);
-            return processor;
-        }
-
-
         @Override
         protected Processor createUpgradeProcessor(
                 SocketWrapperBase<?> socket, ByteBuffer leftoverInput,