Author: markt
Date: Wed Dec 14 11:06:33 2016
New Revision: 1774188
URL: http://svn.apache.org/viewvc?rev=1774188&view=rev
Log:
Don't duplicate storage of clientCertProvider in the Processor
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1774188&r1=1774187&r2=1774188&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Wed Dec 14
11:06:33 2016
@@ -170,6 +170,7 @@ public abstract class AbstractProtocol<S
}
+ private String clientCertProvider = null;
/**
* When client certificate information is presented in a form other than
* instances of {@link java.security.cert.X509Certificate} it needs to be
@@ -178,8 +179,9 @@ public abstract class AbstractProtocol<S
* the AJP connectors, the HTTP APR connector and with the
* {@link org.apache.catalina.valves.SSLValve}. If not specified, the
* default provider will be used.
+ *
+ * @return The name of the JSSE provider to use
*/
- protected String clientCertProvider = null;
public String getClientCertProvider() { return clientCertProvider; }
public void setClientCertProvider(String s) { this.clientCertProvider = s;
}
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=1774188&r1=1774187&r2=1774188&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Wed Dec 14
11:06:33 2016
@@ -197,7 +197,6 @@ public abstract class AbstractAjpProtoco
protected Processor createProcessor() {
AjpProcessor processor = new AjpProcessor(this);
processor.setAdapter(getAdapter());
- processor.setClientCertProvider(getClientCertProvider());
return processor;
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1774188&r1=1774187&r2=1774188&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Wed Dec 14
11:06:33 2016
@@ -277,21 +277,6 @@ public class AjpProcessor extends Abstra
}
- // ------------------------------------------------------------- Properties
-
- /**
- * When client certificate information is presented in a form other than
- * instances of {@link java.security.cert.X509Certificate} it needs to be
- * converted before it can be used and this property controls which JSSE
- * provider is used to perform the conversion.
- */
- private String clientCertProvider = null;
- public String getClientCertProvider() { return clientCertProvider; }
- public void setClientCertProvider(String clientCertProvider) {
- this.clientCertProvider = clientCertProvider;
- }
-
-
// --------------------------------------------------------- Public Methods
@Override
@@ -1159,7 +1144,7 @@ public class AjpProcessor extends Abstra
// Fill the elements.
try {
CertificateFactory cf;
- String clientCertProvider = getClientCertProvider();
+ String clientCertProvider = protocol.getClientCertProvider();
if (clientCertProvider == null) {
cf = CertificateFactory.getInstance("X.509");
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
