From be53d1f622b5d35dd0dc7eda2d3053d5b4b90d23 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 22 Jun 2009 08:47:56 +0000
Subject: [PATCH] Be consistent with the timeouts used in DirectoryServer and WaitForFileDelete. Their default value must be the same.
---
opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java | 7 ++++++-
opendj-sdk/opends/src/server/org/opends/server/tools/WaitForFileDelete.java | 4 +++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java b/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
index 0197a26..736afbe 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
@@ -775,6 +775,10 @@
// if it does not exist in the common servicetag registry.
private ServiceTagRegistration serviceTagRegistry;
+ /**
+ * The default timeout used to start the server in detach mode.
+ */
+ public static int DEFAULT_TIMEOUT = 200;
/**
* Creates a new instance of the Directory Server. This will allow only a
@@ -9175,7 +9179,8 @@
// Not used in this class, but required by the start-ds script
// (see issue #3814)
timeout = new IntegerArgument("timeout", 't', "timeout", true, false,
- true, INFO_SECONDS_PLACEHOLDER.get(), 60,
+ true, INFO_SECONDS_PLACEHOLDER.get(),
+ DEFAULT_TIMEOUT,
null, true, 0, false,
0, INFO_DSCORE_DESCRIPTION_TIMEOUT.get());
argParser.addArgument(timeout);
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 f7ee401..7ce36e3 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
@@ -32,6 +32,7 @@
import java.io.File;
import java.io.RandomAccessFile;
+import org.opends.server.core.DirectoryServer;
import org.opends.server.util.args.ArgumentException;
import org.opends.server.util.args.ArgumentParser;
import org.opends.server.util.args.BooleanArgument;
@@ -158,7 +159,8 @@
timeout = new IntegerArgument("timeout", 't', "timeout", true, false,
- true, INFO_SECONDS_PLACEHOLDER.get(), 200,
+ true, INFO_SECONDS_PLACEHOLDER.get(),
+ DirectoryServer.DEFAULT_TIMEOUT,
null, true, 0, false,
0, INFO_WAIT4DEL_DESCRIPTION_TIMEOUT.get());
argParser.addArgument(timeout);
--
Gitblit v1.10.0