Author: markt
Date: Tue Jun 21 08:35:53 2016
New Revision: 1749465
URL: http://svn.apache.org/viewvc?rev=1749465&view=rev
Log:
Follow-up to r1749373
Use getters since various defaults are applied in the getters
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1749465&r1=1749464&r2=1749465&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Tue Jun 21
08:35:53 2016
@@ -597,8 +597,8 @@ public class SSLHostConfig {
if (result == null) {
if (truststoreFile != null){
try {
- result = SSLUtilBase.getStore(truststoreType,
truststoreProvider,
- truststoreFile, truststorePassword);
+ result = SSLUtilBase.getStore(getTruststoreType(),
getTruststoreProvider(),
+ getTruststoreFile(), getTruststorePassword());
} catch (IOException ioe) {
Throwable cause = ioe.getCause();
if (cause instanceof UnrecoverableKeyException) {
@@ -606,8 +606,8 @@ public class SSLHostConfig {
log.warn(sm.getString("jsse.invalid_truststore_password"),
cause);
// Re-try
- result = SSLUtilBase.getStore(truststoreType,
truststoreProvider,
- truststoreFile, null);
+ result = SSLUtilBase.getStore(getTruststoreType(),
getTruststoreProvider(),
+ getTruststoreFile(), null);
} else {
// Something else went wrong - re-throw
throw ioe;
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java?rev=1749465&r1=1749464&r2=1749465&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Tue Jun 21 08:35:53 2016
@@ -182,8 +182,9 @@ public class SSLHostConfigCertificate {
KeyStore result = certificateKeystore;
if (result == null) {
- result = SSLUtilBase.getStore(certificateKeystoreType,
certificateKeystoreProvider,
- certificateKeystoreFile, certificateKeystorePassword);
+ result = SSLUtilBase.getStore(getCertificateKeystoreType(),
+ getCertificateKeystoreProvider(),
getCertificateKeystoreFile(),
+ getCertificateKeystorePassword());
}
return result;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
