From ad74bf0a2cc09d0036a12793848b975e7b16eaa6 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Fri, 27 Jul 2007 15:26:22 +0000
Subject: [PATCH] modifications to fix issue #2022.
---
opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java b/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java
index bd00412..7b71e2a 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java
@@ -204,10 +204,10 @@
* The return code is not the one expected, assume the server could
* not be stopped.
*/
- throw new ApplicationException(ApplicationException.Type.STOP_ERROR,
- ResourceProvider.getInstance().getMsg(
- "error-stopping-server-code",
- String.valueOf(returnValue)),
+ throw new ApplicationException(
+ ApplicationReturnCode.ReturnCode.STOP_ERROR, ResourceProvider
+ .getInstance().getMsg("error-stopping-server-code",
+ String.valueOf(returnValue)),
null);
} else {
if (application != null) {
@@ -219,8 +219,9 @@
}
} catch (Exception e) {
- throw new ApplicationException(ApplicationException.Type.STOP_ERROR,
- getThrowableMsg("error-stopping-server", e), e);
+ throw new ApplicationException(
+ ApplicationReturnCode.ReturnCode.STOP_ERROR, getThrowableMsg(
+ "error-stopping-server", e), e);
}
} finally {
if (suppressOutput && StandardOutputSuppressor.isSuppressed()) {
@@ -437,7 +438,7 @@
if (Utils.isWindows())
{
throw new ApplicationException(
- ApplicationException.Type.START_ERROR,
+ ApplicationReturnCode.ReturnCode.START_ERROR,
getMsg("error-starting-server-in-windows",
String.valueOf(port)),
null);
@@ -445,7 +446,7 @@
else
{
throw new ApplicationException(
- ApplicationException.Type.START_ERROR,
+ ApplicationReturnCode.ReturnCode.START_ERROR,
getMsg("error-starting-server-in-unix",
String.valueOf(port)),
null);
@@ -455,9 +456,9 @@
} catch (IOException ioe)
{
- throw new ApplicationException(ApplicationException.Type.START_ERROR,
- getThrowableMsg("error-starting-server", ioe),
- ioe);
+ throw new ApplicationException(
+ ApplicationReturnCode.ReturnCode.START_ERROR, getThrowableMsg(
+ "error-starting-server", ioe), ioe);
}
} finally {
if (suppressOuput && StandardOutputSuppressor.isSuppressed()) {
@@ -611,9 +612,9 @@
}
} catch (Throwable t)
{
- ex =
- new ApplicationException(ApplicationException.Type.START_ERROR,
- getThrowableMsg(errorTag, t), t);
+ ex = new ApplicationException(
+ ApplicationReturnCode.ReturnCode.START_ERROR,
+ getThrowableMsg(errorTag, t), t);
}
isFinished = true;
--
Gitblit v1.10.0