From c1163974763652fed86c1559b169a83923f91d1d Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 21 Dec 2015 13:55:42 +0000
Subject: [PATCH] Converted try/finally Closeable.close() (or Utils.closeSilently()) into try-with-resources
---
opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java
index a7d4a73..d90ea02 100644
--- a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java
+++ b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java
@@ -152,11 +152,8 @@
if (!onDiskTrustStorePath.exists()) {
onDiskTrustStore.load(null, null);
} else {
- final FileInputStream fos = new FileInputStream(onDiskTrustStorePath);
- try {
+ try (final FileInputStream fos = new FileInputStream(onDiskTrustStorePath)) {
onDiskTrustStore.load(fos, DEFAULT_PASSWORD);
- } finally {
- fos.close();
}
}
final TrustManagerFactory tmf =
@@ -295,9 +292,9 @@
if (!truststoreFile.exists()) {
createFile(truststoreFile);
}
- final FileOutputStream fos = new FileOutputStream(truststoreFile);
- onDiskTrustStore.store(fos, DEFAULT_PASSWORD);
- fos.close();
+ try (final FileOutputStream fos = new FileOutputStream(truststoreFile)) {
+ onDiskTrustStore.store(fos, DEFAULT_PASSWORD);
+ }
} catch (final Exception e) {
LOG.warn(LocalizableMessage.raw("Error saving store to disk: " + e));
}
--
Gitblit v1.10.0