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/UpgradeContext.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeContext.java b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeContext.java
index 2bed0e8..52421a9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeContext.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeContext.java
@@ -29,7 +29,6 @@
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.tools.upgrade.Upgrade.EXIT_CODE_ERROR;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
@@ -37,7 +36,10 @@
import javax.security.auth.callback.TextOutputCallback;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.tools.ClientException;
+
+import com.forgerock.opendj.cli.ClientException;
+import com.forgerock.opendj.cli.ReturnCode;
+
import org.opends.server.types.InitializationException;
import org.opends.server.util.BuildVersion;
@@ -286,7 +288,7 @@
}
catch (final Exception e)
{
- throw new ClientException(EXIT_CODE_ERROR,
+ throw new ClientException(ReturnCode.ERROR_UNEXPECTED,
ERR_UPGRADE_DISPLAY_NOTIFICATION_ERROR.get(e.getMessage()));
}
}
@@ -313,7 +315,7 @@
}
catch (final Exception e)
{
- throw new ClientException(EXIT_CODE_ERROR,
+ throw new ClientException(ReturnCode.ERROR_UNEXPECTED,
ERR_UPGRADE_DISPLAY_NOTIFICATION_ERROR.get(e.getMessage()));
}
}
@@ -337,7 +339,7 @@
}
catch (final Exception e)
{
- throw new ClientException(EXIT_CODE_ERROR,
+ throw new ClientException(ReturnCode.ERROR_UNEXPECTED,
ERR_UPGRADE_DISPLAY_NOTIFICATION_ERROR.get(e.getMessage()));
}
}
@@ -367,7 +369,7 @@
}
catch (final Exception e)
{
- throw new ClientException(EXIT_CODE_ERROR,
+ throw new ClientException(ReturnCode.ERROR_UNEXPECTED,
ERR_UPGRADE_DISPLAY_CONFIRM_ERROR.get(e.getMessage()));
}
return confirmYNCallback.getSelectedIndex();
--
Gitblit v1.10.0