Author: kfujino
Date: Tue Sep 16 10:10:37 2014
New Revision: 1625234
URL: http://svn.apache.org/r1625234
Log:
Reduce duplicated code.
All AJP connectors use common method to configuration of processor.
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/ajp/AjpProtocol.java
tomcat/trunk/webapps/docs/changelog.xml
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=1625234&r1=1625233&r2=1625234&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Tue Sep 16
10:10:37 2014
@@ -75,6 +75,14 @@ public abstract class AbstractAjpProtoco
}
}
+ protected void configureProcessor(AbstractAjpProcessor<S> processor) {
+ processor.setAdapter(getAdapter());
+ processor.setTomcatAuthentication(getTomcatAuthentication());
+ processor.setRequiredSecret(requiredSecret);
+ processor.setKeepAliveTimeout(getKeepAliveTimeout());
+ processor.setClientCertProvider(getClientCertProvider());
+ }
+
protected abstract static class AbstractAjpConnectionHandler<S,P extends
AbstractAjpProcessor<S>>
extends AbstractConnectionHandler<S, P> {
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=1625234&r1=1625233&r2=1625234&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Tue Sep 16
10:10:37 2014
@@ -143,11 +143,7 @@ public class AjpAprProtocol extends Abst
@Override
protected AjpAprProcessor createProcessor() {
AjpAprProcessor processor = new AjpAprProcessor(proto.packetSize,
(AprEndpoint)proto.endpoint);
- processor.setAdapter(proto.getAdapter());
- processor.setTomcatAuthentication(proto.tomcatAuthentication);
- processor.setRequiredSecret(proto.requiredSecret);
- processor.setKeepAliveTimeout(proto.getKeepAliveTimeout());
- processor.setClientCertProvider(proto.getClientCertProvider());
+ proto.configureProcessor(processor);
register(processor);
return processor;
}
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=1625234&r1=1625233&r2=1625234&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java Tue Sep 16
10:10:37 2014
@@ -144,11 +144,7 @@ public class AjpNio2Protocol extends Abs
@Override
protected AjpNio2Processor createProcessor() {
AjpNio2Processor processor = new
AjpNio2Processor(proto.packetSize, (Nio2Endpoint) proto.endpoint);
- processor.setAdapter(proto.getAdapter());
- processor.setTomcatAuthentication(proto.tomcatAuthentication);
- processor.setRequiredSecret(proto.requiredSecret);
- processor.setKeepAliveTimeout(proto.getKeepAliveTimeout());
- processor.setClientCertProvider(proto.getClientCertProvider());
+ proto.configureProcessor(processor);
register(processor);
return processor;
}
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=1625234&r1=1625233&r2=1625234&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Tue Sep 16
10:10:37 2014
@@ -173,11 +173,7 @@ public class AjpNioProtocol extends Abst
@Override
protected AjpNioProcessor createProcessor() {
AjpNioProcessor processor = new AjpNioProcessor(proto.packetSize,
(NioEndpoint)proto.endpoint);
- processor.setAdapter(proto.getAdapter());
- processor.setTomcatAuthentication(proto.tomcatAuthentication);
- processor.setRequiredSecret(proto.requiredSecret);
- processor.setKeepAliveTimeout(proto.getKeepAliveTimeout());
- processor.setClientCertProvider(proto.getClientCertProvider());
+ proto.configureProcessor(processor);
register(processor);
return processor;
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java?rev=1625234&r1=1625233&r2=1625234&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java Tue Sep 16
10:10:37 2014
@@ -132,11 +132,7 @@ public class AjpProtocol extends Abstrac
@Override
protected AjpProcessor createProcessor() {
AjpProcessor processor = new AjpProcessor(proto.packetSize,
(JIoEndpoint)proto.endpoint);
- processor.setAdapter(proto.getAdapter());
- processor.setTomcatAuthentication(proto.tomcatAuthentication);
- processor.setRequiredSecret(proto.requiredSecret);
- processor.setKeepAliveTimeout(proto.getKeepAliveTimeout());
- processor.setClientCertProvider(proto.getClientCertProvider());
+ proto.configureProcessor(processor);
register(processor);
return processor;
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1625234&r1=1625233&r2=1625234&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Sep 16 10:10:37 2014
@@ -160,6 +160,10 @@
Ensure that AJP connectors enable the <code>KeepAliveTimeout</code>.
(kfujino)
</fix>
+ <fix>
+ Reduce duplicated code. All AJP connectors use common method to
+ configuration of processor. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
