Be consistent with the timeouts used in DirectoryServer and WaitForFileDele...

jvergara

22.47.2009 81b522eadfdd4f2a1c93eeded46a6e891c777518

Be consistent with the timeouts used in DirectoryServer and WaitForFileDelete.  Their default value must be the same.

 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);

 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);