From eb8ab492e9095c3ee7f88527d9e61cb3cf4ca2d5 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 11 Feb 2014 13:38:04 +0000
Subject: [PATCH] Modified tools : replaced CLIException by ClientException. Replaced closeIfNotNull by Utils.closeSilently Modified unit tests due to modifications in console application.
---
opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java
index be888ba..6c7e07e 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java
@@ -28,6 +28,7 @@
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.ldap.tools.ToolsMessages.*;
import static com.forgerock.opendj.cli.Utils.filterExitCode;
+import static org.forgerock.util.Utils.closeSilently;
import java.io.BufferedReader;
import java.io.FileInputStream;
@@ -225,7 +226,7 @@
errPrintln(LocalizableMessage.raw(e.toString()));
return ResultCode.CLIENT_SIDE_FILTER_ERROR.intValue();
} finally {
- closeIfNotNull(in);
+ closeSilently(in);
}
}
@@ -305,8 +306,8 @@
}
return ResultCode.CLIENT_SIDE_LOCAL_ERROR.intValue();
} finally {
- closeIfNotNull(sourceReader, outputWriter);
- closeIfNotNull(sourceInputStream, outputStream);
+ closeSilently(sourceReader, outputWriter);
+ closeSilently(sourceInputStream, outputStream);
}
return ResultCode.SUCCESS.intValue();
--
Gitblit v1.10.0