From 03fe0954e42abf00746b8efa4c79ee74cf514427 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Thu, 27 May 2010 15:10:50 +0000
Subject: [PATCH] Fix an issue with connection timeouts in CLI. The timeout is now configurable on CLI with the --connectTimeout option (expressed in milliseconds), the default is 30 000 milliseconds. This solves Issue 4196.

---
 opends/src/quicksetup/org/opends/quicksetup/UserData.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/opends/src/quicksetup/org/opends/quicksetup/UserData.java b/opends/src/quicksetup/org/opends/quicksetup/UserData.java
index 2260c03..7cbbaa9 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/UserData.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/UserData.java
@@ -35,6 +35,7 @@
 
 import org.opends.admin.ads.ServerDescriptor;
 import org.opends.admin.ads.SuffixDescriptor;
+import org.opends.admin.ads.util.ConnectionUtils;
 import org.opends.quicksetup.installer.AuthenticationData;
 import org.opends.quicksetup.installer.DataReplicationOptions;
 import org.opends.quicksetup.installer.NewSuffixOptions;
@@ -102,6 +103,8 @@
 
   private static String defaultHostName;
 
+  private int connectTimeout = ConnectionUtils.getDefaultLDAPTimeout();
+
   /**
    * The script name to be used to get and set the java arguments for the
    * server runtime.
@@ -883,4 +886,23 @@
         "upgrade", "verify-index", "dbtest"
     };
   }
+
+  /**
+   * Sets the timeout to be used to establish a connection.
+   * @param connectTimeout the timeout to be used to establish a connection.
+   */
+  public void setConnectTimeout(int connectTimeout)
+  {
+    this.connectTimeout = connectTimeout;
+  }
+
+  /**
+   * Returns the timeout to be used to connect in milliseconds.
+   * @return the timeout to be used to connect in milliseconds.  Returns
+   * {@code 0} if there is no timeout.
+   */
+  public int getConnectTimeout()
+  {
+    return connectTimeout;
+  }
 }

--
Gitblit v1.10.0