From c37b0d815d222d000d2a220e929b488ecff665c3 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Fri, 14 Feb 2014 15:29:34 +0000
Subject: [PATCH]
---
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java
index b3dafed..bf693e9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java
@@ -67,7 +67,6 @@
import org.opends.server.admin.client.ManagedObjectDecodingException;
import org.opends.server.admin.client.MissingMandatoryPropertiesException;
import org.opends.server.admin.client.OperationRejectedException;
-import org.opends.server.tools.ClientException;
import org.opends.server.types.InitializationException;
import org.opends.server.util.BuildVersion;
import org.opends.server.util.EmbeddedUtils;
@@ -79,7 +78,7 @@
import com.forgerock.opendj.cli.SubCommand;
import com.forgerock.opendj.cli.SubCommandArgumentParser;
import com.forgerock.opendj.cli.ArgumentGroup;
-import com.forgerock.opendj.cli.CLIException;
+import com.forgerock.opendj.cli.ClientException;
import org.opends.server.util.cli.CommandBuilder;
import org.opends.server.util.cli.ConsoleApplication;
import org.opends.server.util.cli.Menu;
@@ -123,7 +122,7 @@
*/
@Override
public MenuResult<Integer> invoke(ConsoleApplication app)
- throws CLIException {
+ throws ClientException {
try {
MenuResult<Integer> result = handler.run(app, factory);
@@ -145,7 +144,7 @@
return MenuResult.success(1);
} catch (ClientException e) {
app.println(e.getMessageObject());
- return MenuResult.success(e.getExitCode());
+ return MenuResult.success(e.getReturnCode());
}
}
}
@@ -253,7 +252,7 @@
*/
@Override
public final MenuResult<Integer> invoke(ConsoleApplication app)
- throws CLIException {
+ throws ClientException {
try {
app.println();
app.println();
@@ -265,7 +264,7 @@
}
return result;
- } catch (CLIException e) {
+ } catch (ClientException e) {
app.println(e.getMessageObject());
return MenuResult.success(1);
}
@@ -967,7 +966,7 @@
} else {
return result.getValue();
}
- } catch (CLIException e) {
+ } catch (ClientException e) {
app.println(e.getMessageObject());
return 1;
}
@@ -994,9 +993,6 @@
} catch (ArgumentException e) {
println(e.getMessageObject());
return 1;
- } catch (CLIException e) {
- println(e.getMessageObject());
- return 1;
} catch (ClientException e) {
Throwable cause = e.getCause();
if (cause instanceof ManagedObjectDecodingException) {
--
Gitblit v1.10.0