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/Utils.java | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java
index 28cafe9..8131b6c 100644
--- a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java
+++ b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java
@@ -161,13 +161,10 @@
* If a problem occurs while trying to read the specified file.
*/
public static byte[] readBytesFromFile(final String filePath) throws IOException {
- byte[] val = null;
- FileInputStream fis = null;
- try {
- final File file = new File(filePath);
- fis = new FileInputStream(file);
- final long length = file.length();
- val = new byte[(int) length];
+ final File file = new File(filePath);
+ final long length = file.length();
+ try (FileInputStream fis = new FileInputStream(file)) {
+ byte[] val = new byte[(int) length];
// Read in the bytes
int offset = 0;
int numRead = 0;
@@ -182,10 +179,6 @@
}
return val;
- } finally {
- if (fis != null) {
- fis.close();
- }
}
}
--
Gitblit v1.10.0