From bc51a655469893084889271eb34e42bb25831c42 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 26 Mar 2007 18:37:29 +0000
Subject: [PATCH] Fix intended for issue 1432 (install fails to start opends).
---
opends/src/server/org/opends/server/tools/StopDS.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/StopDS.java b/opends/src/server/org/opends/server/tools/StopDS.java
index 598cf35..5d53ac8 100644
--- a/opends/src/server/org/opends/server/tools/StopDS.java
+++ b/opends/src/server/org/opends/server/tools/StopDS.java
@@ -823,9 +823,23 @@
isServerRunning = true;
}
+ boolean configuredAsService =
+ DirectoryServer.isRunningAsWindowsService();
+
if (!isServerRunning)
{
- if (restartPresent)
+ if (configuredAsService && !windowsNetStopPresent)
+ {
+ if (restartPresent)
+ {
+ returnValue = RESTART_AS_WINDOW_SERVICE;
+ }
+ else
+ {
+ returnValue = STOP_AS_WINDOW_SERVICE;
+ }
+ }
+ else if (restartPresent)
{
returnValue = START_SERVER;
}
@@ -836,9 +850,6 @@
}
else
{
- boolean configuredAsService =
- DirectoryServer.isRunningAsWindowsService();
-
if (configuredAsService)
{
if (windowsNetStopPresent)
--
Gitblit v1.10.0