You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/11/24 15:50:26 UTC
svn commit: r1716152 -
/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
Author: markt
Date: Tue Nov 24 14:50:26 2015
New Revision: 1716152
URL: http://svn.apache.org/viewvc?rev=1716152&view=rev
Log:
Checkstyle police
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java?rev=1716152&r1=1716151&r2=1716152&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java Tue Nov 24 14:50:26 2015
@@ -75,7 +75,7 @@ public class OpenSSLUtil implements SSLU
type = sslHostConfig.getTruststoreType();
}
if (sslHostConfig.getTruststoreAlgorithm() != null) {
- algorithm = sslHostConfig.getTruststoreAlgorithm();
+ algorithm = sslHostConfig.getTruststoreAlgorithm();
}
TrustManagerFactory factory;
@@ -86,9 +86,9 @@ public class OpenSSLUtil implements SSLU
KeyStore keystore = KeyStore.getInstance(type);
try (InputStream stream = ConfigFileLoader.getInputStream(storefile)) {
- keystore.load(stream, password.toCharArray());
+ keystore.load(stream, password.toCharArray());
}
-
+
factory.init(keystore);
TrustManager[] managers = factory.getTrustManagers();
return managers;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org