--- a/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java Mon Nov 11 08:36:53 2013 +0000
+++ b/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java Mon Nov 11 16:54:41 2013 +0800
@@ -1781,14 +1781,14 @@
try {
java.security.cert.Certificate[] cs = null;
if (altCertChain != null) {
- try {
+ try (FileInputStream fis = new FileInputStream(altCertChain)) {
cs = CertificateFactory.getInstance("X.509").
- generateCertificates(new FileInputStream(altCertChain)).
+ generateCertificates(fis).
toArray(new Certificate[0]);
- } catch (CertificateException ex) {
- error(rb.getString("Cannot.restore.certchain.from.file.specified"));
} catch (FileNotFoundException ex) {
error(rb.getString("File.specified.by.certchain.does.not.exist"));
+ } catch (CertificateException | IOException ex) {
+ error(rb.getString("Cannot.restore.certchain.from.file.specified"));
}
} else {
try {