From 9a300db9864e8da7187930315a9784369ace9c74 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 28 Nov 2016 08:33:20 +0000
Subject: [PATCH] AutoRefactor'ed use try-with-resources
---
opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java
index 40e273d..b70b748 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java
@@ -36,7 +36,6 @@
import java.io.PrintStream;
import java.util.List;
-import com.forgerock.opendj.cli.IntegerArgument;
import org.forgerock.i18n.LocalizableException;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.DecodeException;
@@ -51,12 +50,13 @@
import org.forgerock.opendj.ldif.LDIFEntryReader;
import org.forgerock.opendj.ldif.LDIFEntryWriter;
import org.forgerock.opendj.ldif.RejectedChangeRecordListener;
+import org.forgerock.util.annotations.VisibleForTesting;
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ArgumentParser;
import com.forgerock.opendj.cli.BooleanArgument;
+import com.forgerock.opendj.cli.IntegerArgument;
import com.forgerock.opendj.cli.StringArgument;
-import org.forgerock.util.annotations.VisibleForTesting;
/**
* A tool that can be used to issue update (Add/Delete/Modify/ModifyDN) requests
@@ -142,17 +142,12 @@
return ResultCode.SUCCESS.intValue();
}
- InputStream sourceInputStream = null;
- OutputStream outputStream = null;
+ final List<String> trailingArguments = argParser.getTrailingArguments();
LDIFEntryReader sourceReader = null;
LDIFChangeRecordReader changesReader = null;
LDIFEntryWriter outputWriter = null;
-
- try {
- final List<String> trailingArguments = argParser.getTrailingArguments();
- sourceInputStream = getLDIFToolInputStream(this, trailingArguments.get(0));
- outputStream = getLDIFToolOutputStream(this, outputFilename);
-
+ try (InputStream sourceInputStream = getLDIFToolInputStream(this, trailingArguments.get(0));
+ OutputStream outputStream = getLDIFToolOutputStream(this, outputFilename)) {
final int nbTrailingArgs = trailingArguments.size();
final boolean readChangesFromStdin = nbTrailingArgs == 1
|| (nbTrailingArgs == 2 && USE_SYSTEM_STREAM_TOKEN.equals(trailingArguments.get(1)));
@@ -253,8 +248,7 @@
} catch (final ArgumentException ae) {
throw newToolParamException(ae, ae.getMessageObject());
} finally {
- closeSilently(sourceReader, changesReader, outputWriter,
- sourceInputStream, outputStream);
+ closeSilently(sourceReader, changesReader, outputWriter);
}
return ResultCode.SUCCESS.intValue();
--
Gitblit v1.10.0