From 9a95ed9e009f499cee986d8c03fef76faffaf19b Mon Sep 17 00:00:00 2001
From: jcambon <jcambon@localhost>
Date: Thu, 09 Apr 2009 10:08:41 +0000
Subject: [PATCH] Fix for issue #3814 : start-ds script return before server has started
---
opendj-sdk/opends/src/server/org/opends/server/tools/WaitForFileDelete.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/WaitForFileDelete.java b/opendj-sdk/opends/src/server/org/opends/server/tools/WaitForFileDelete.java
index 41d0f8f..85bfda7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/WaitForFileDelete.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/WaitForFileDelete.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.server.tools;
import org.opends.messages.Message;
@@ -39,6 +39,7 @@
import org.opends.server.util.args.StringArgument;
import static org.opends.messages.ToolMessages.*;
+import static org.opends.messages.CoreMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -125,6 +126,8 @@
StringArgument logFilePath = null;
StringArgument targetFilePath = null;
StringArgument outputFilePath = null;
+ BooleanArgument useLastKnownGoodConfig = null;
+ BooleanArgument quietMode = null;
Message toolDescription = INFO_WAIT4DEL_TOOL_DESCRIPTION.get();
ArgumentParser argParser = new ArgumentParser(CLASS_NAME, toolDescription,
@@ -161,6 +164,20 @@
argParser.addArgument(timeout);
+ // Not used in this class, but required by the start-ds script
+ // (see issue #3814)
+ useLastKnownGoodConfig =
+ new BooleanArgument("lastknowngoodconfig", 'L',
+ "useLastKnownGoodConfig",
+ INFO_DSCORE_DESCRIPTION_LASTKNOWNGOODCFG.get());
+ argParser.addArgument(useLastKnownGoodConfig);
+
+ // Not used in this class, but required by the start-ds script
+ // (see issue #3814)
+ quietMode = new BooleanArgument("quiet", 'Q', "quiet",
+ INFO_DESCRIPTION_QUIET.get());
+ argParser.addArgument(quietMode);
+
showUsage = new BooleanArgument("help", 'H', "help",
INFO_WAIT4DEL_DESCRIPTION_HELP.get());
argParser.addArgument(showUsage);
--
Gitblit v1.10.0