You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2018/10/29 14:50:17 UTC
svn commit: r1845133 -
/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/TokenStreamProvider.java
Author: remm
Date: Mon Oct 29 14:50:17 2018
New Revision: 1845133
URL: http://svn.apache.org/viewvc?rev=1845133&view=rev
Log:
Code cleanup.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/TokenStreamProvider.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/TokenStreamProvider.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/TokenStreamProvider.java?rev=1845133&r1=1845132&r2=1845133&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/TokenStreamProvider.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/TokenStreamProvider.java Mon Oct 29 14:50:17 2018
@@ -83,25 +83,20 @@ public class TokenStreamProvider extends
private TrustManager[] configureCaCert(String caCertFile) throws Exception {
if (caCertFile != null) {
- try {
- InputStream pemInputStream = new BufferedInputStream(new FileInputStream(caCertFile));
- try {
- CertificateFactory certFactory = CertificateFactory.getInstance("X509");
- X509Certificate cert = (X509Certificate)certFactory.generateCertificate(pemInputStream);
+ try (InputStream pemInputStream = new BufferedInputStream(new FileInputStream(caCertFile))) {
+ CertificateFactory certFactory = CertificateFactory.getInstance("X509");
+ X509Certificate cert = (X509Certificate)certFactory.generateCertificate(pemInputStream);
- KeyStore trustStore = KeyStore.getInstance("JKS");
- trustStore.load(null);
+ KeyStore trustStore = KeyStore.getInstance("JKS");
+ trustStore.load(null);
- String alias = cert.getSubjectX500Principal().getName();
- trustStore.setCertificateEntry(alias, cert);
+ String alias = cert.getSubjectX500Principal().getName();
+ trustStore.setCertificateEntry(alias, cert);
- TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
- trustManagerFactory.init(trustStore);
+ TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+ trustManagerFactory.init(trustStore);
- return trustManagerFactory.getTrustManagers();
- } finally {
- pemInputStream.close();
- }
+ return trustManagerFactory.getTrustManagers();
} catch (FileNotFoundException fnfe) {
log.error(sm.getString("tokenStream.fileNotFound", caCertFile));
throw fnfe;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org