Alon Bar-Lev has uploaded a new change for review. Change subject: utils: EngineEncryptionUtils: java7 cleanup ......................................................................
utils: EngineEncryptionUtils: java7 cleanup Change-Id: Idb5b83c9e11f206738b063e4b25f7c307922314e Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/EngineEncryptionUtils.java 1 file changed, 1 insertion(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/97/20797/1 diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/EngineEncryptionUtils.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/EngineEncryptionUtils.java index 5eb4ab4..4fd10ed 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/EngineEncryptionUtils.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/EngineEncryptionUtils.java @@ -2,7 +2,6 @@ import java.io.File; import java.io.FileInputStream; -import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; import java.security.GeneralSecurityException; @@ -46,9 +45,7 @@ * @return engine key store. */ private static KeyStore _getKeyStore(String type, File file, char [] password) { - InputStream in = null; - try { - in = new FileInputStream(file); + try (final InputStream in = new FileInputStream(file)) { KeyStore ks = KeyStore.getInstance(type); ks.load(in, password); return ks; @@ -60,14 +57,6 @@ ), e ); - } finally { - if (in != null) { - try { - in.close(); - } catch (IOException e) { - log.error("Cannot close key store", e); - } - } } } -- To view, visit http://gerrit.ovirt.org/20797 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idb5b83c9e11f206738b063e4b25f7c307922314e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
