From e6eab56a4ebd79049b1e64b70ec7363a2929d1d2 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 05 Sep 2007 16:11:25 +0000
Subject: [PATCH] Fix for issue 2187 (start-ds dos not return proper error code).
---
opendj-sdk/opends/resource/bin/start-ds | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/opendj-sdk/opends/resource/bin/start-ds b/opendj-sdk/opends/resource/bin/start-ds
index 4e314cd..9eab22d 100755
--- a/opendj-sdk/opends/resource/bin/start-ds
+++ b/opendj-sdk/opends/resource/bin/start-ds
@@ -158,6 +158,22 @@
"${JAVA_BIN}" -Xms8M -Xmx8M org.opends.server.tools.WaitForFileDelete \
--targetFile "${STARTING_FILE}"
fi
+ EC=${?}
+ if test ${EC} -eq 0
+ then
+ # An exit code of 98 means that the server is already running.
+ ${JAVA_BIN} ${SCRIPT_NAME_ARG} org.opends.server.core.DirectoryServer \
+ --configClass org.opends.server.extensions.ConfigFileHandler \
+ --configFile "${CONFIG_FILE}" --checkStartability
+ EC=${?}
+ if test ${EC} -eq 98
+ then
+ exit 0
+ else
+ # Could not start the server
+ exit 1
+ fi
+ fi
exit ${?}
else
if test ${EC} -eq 100
--
Gitblit v1.10.0