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/upgrade/UpgradeCli.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeCli.java b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeCli.java
index 8a16a96..6b426a6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeCli.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeCli.java
@@ -49,14 +49,13 @@
import javax.security.auth.callback.UnsupportedCallbackException;
import org.opends.server.extensions.ConfigFileHandler;
-import org.opends.server.tools.ClientException;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.BooleanArgument;
import com.forgerock.opendj.cli.StringArgument;
import com.forgerock.opendj.cli.SubCommandArgumentParser;
-import com.forgerock.opendj.cli.CLIException;
+import com.forgerock.opendj.cli.ClientException;
import org.opends.server.util.cli.ConsoleApplication;
/**
@@ -364,7 +363,7 @@
}
catch (ClientException ex)
{
- return ex.getExitCode();
+ return ex.getReturnCode();
}
catch (Exception ex)
{
@@ -496,7 +495,7 @@
readInput(LocalizableMessage.raw(prompt), defaultOption,
Style.SUBTITLE);
}
- catch (CLIException e)
+ catch (ClientException e)
{
logger.error(LocalizableMessage.raw(e.getMessage()));
break;
--
Gitblit v1.10.0