From 8f8fa9a5bc51f0a11629031cb5bdc0753a839ade Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Mon, 31 May 2010 12:59:15 +0000
Subject: [PATCH] Resolve an issue when uninstalling in CLI mode and tool.properties has some properties. When doing uninstall, always stop the local server.
---
opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java b/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
index 305345f..6f1f267 100644
--- a/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
+++ b/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
@@ -828,7 +828,13 @@
notifyListeners(getFormattedWithPoints(
INFO_PROGRESS_STOPPING_NON_VERBOSE.get()));
}
- new ServerController(this).stopServer(!isVerbose());
+ // In case of uninstall, the server stop has to run locally.
+ // In order to bypass the tools.properties mechanism, if any,
+ // we systematically add the --noPropertiesFile flag
+ // when we run the stop-ds command. This is done
+ // by setting the parameter "noPropertiesFile" to 'true'
+ // in the following call.
+ new ServerController(this).stopServer(!isVerbose(),true);
if (!isVerbose())
{
notifyListeners(getFormattedDoneWithLineBreak());
--
Gitblit v1.10.0