From 7934d276c1dfdc3224c391c23f574d244c5b0a10 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 29 Nov 2012 23:42:35 +0000
Subject: [PATCH] Minor code cleanup.
---
opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java b/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java
index cf9dbb4..94f6e23 100644
--- a/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java
+++ b/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java
@@ -30,6 +30,7 @@
import static com.forgerock.opendj.ldap.tools.ToolConstants.*;
import static com.forgerock.opendj.ldap.tools.ToolsMessages.*;
import static com.forgerock.opendj.ldap.tools.Utils.filterExitCode;
+import static com.forgerock.opendj.util.StaticUtils.closeSilently;
import java.io.FileInputStream;
import java.io.IOException;
@@ -231,6 +232,7 @@
return verbose.isPresent();
}
+ @SuppressWarnings("resource")
private int run(final String[] args) {
// Create the command-line argument parser for use with this
// program.
@@ -471,8 +473,8 @@
writer = new LDIFEntryWriter(getOutputStream());
final VisitorImpl visitor = new VisitorImpl();
+ ChangeRecordReader reader = null;
try {
- ChangeRecordReader reader;
if (filename.isPresent()) {
try {
reader = new LDIFChangeRecordReader(new FileInputStream(filename.getValue()));
@@ -503,9 +505,7 @@
return ResultCode.CLIENT_SIDE_LOCAL_ERROR.intValue();
}
} finally {
- if (connection != null) {
- connection.close();
- }
+ closeSilently(reader, connection);
}
return ResultCode.SUCCESS.intValue();
--
Gitblit v1.10.0