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/ConnectionFactoryProvider.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProvider.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProvider.java
index b489a09..a50354c 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProvider.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProvider.java
@@ -50,7 +50,7 @@
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ArgumentParser;
import com.forgerock.opendj.cli.BooleanArgument;
-import com.forgerock.opendj.cli.CLIException;
+import com.forgerock.opendj.cli.ClientException;
import com.forgerock.opendj.cli.ConsoleApplication;
import com.forgerock.opendj.cli.FileBasedArgument;
import com.forgerock.opendj.cli.IntegerArgument;
@@ -495,7 +495,7 @@
app.readInput(LocalizableMessage.raw("Authentication ID:"), bindNameArg
.getDefaultValue() == null ? null : "dn: "
+ bindNameArg.getDefaultValue());
- } catch (CLIException e) {
+ } catch (ClientException e) {
throw new ArgumentException(LocalizableMessage
.raw("Unable to read authentication ID"), e);
}
@@ -527,7 +527,7 @@
value =
app.readInput(LocalizableMessage.raw("Bind name:"), bindNameArg
.getDefaultValue() == null ? value : bindNameArg.getDefaultValue());
- } catch (CLIException e) {
+ } catch (ClientException e) {
throw new ArgumentException(LocalizableMessage.raw("Unable to read bind name"), e);
}
}
@@ -701,7 +701,7 @@
if (value.length == 0 && app.isInteractive()) {
try {
value = app.readPassword(LocalizableMessage.raw("Bind Password:"));
- } catch (CLIException e) {
+ } catch (ClientException e) {
throw new ArgumentException(LocalizableMessage.raw("Unable to read password"), e);
}
}
--
Gitblit v1.10.0