Author: remm Date: Tue Nov 24 10:29:08 2015 New Revision: 1716098 URL: http://svn.apache.org/viewvc?rev=1716098&view=rev Log: This looks like a good "try with resources" candidate.
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=1716098&r1=1716097&r2=1716098&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 10:29:08 2015 @@ -16,7 +16,6 @@ */ package org.apache.tomcat.util.net.openssl; -import java.io.IOException; import java.io.InputStream; import java.security.KeyStore; import java.util.List; @@ -86,20 +85,8 @@ public class OpenSSLUtil implements SSLU factory = TrustManagerFactory.getInstance(algorithm); KeyStore keystore = KeyStore.getInstance(type); - InputStream stream = null; - try { - stream = ConfigFileLoader.getInputStream(storefile); + try (InputStream stream = ConfigFileLoader.getInputStream(storefile)) { keystore.load(stream, password.toCharArray()); - } catch (Exception ex) { - throw ex; - } finally { - if (stream != null) { - try { - stream.close(); - } catch (IOException ioe) { - // Do nothing - } - } } factory.init(keystore); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org