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/guitools/org/opends/guitools/controlpanel/util/Utilities.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java b/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
index 7654c1c..f67322f 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
@@ -2363,7 +2363,7 @@
           ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
     }
     ctx = Utils.createLdapsContext(usedUrl,
-        bindDN, pwd, Utils.getDefaultLDAPTimeout(), null,
+        bindDN, pwd, controlInfo.getConnectTimeout(), null,
         controlInfo.getTrustManager());
 
     /*
@@ -2402,7 +2402,7 @@
             ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
       }
       ctx = Utils.createStartTLSContext(usedUrl,
-          bindDN, pwd, Utils.getDefaultLDAPTimeout(), null,
+          bindDN, pwd, controlInfo.getConnectTimeout(), null,
           controlInfo.getTrustManager(), null);
     }
     else if (controlInfo.connectUsingLDAPS())
@@ -2414,7 +2414,7 @@
             ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
       }
       ctx = Utils.createLdapsContext(usedUrl,
-          bindDN, pwd, Utils.getDefaultLDAPTimeout(), null,
+          bindDN, pwd, controlInfo.getConnectTimeout(), null,
           controlInfo.getTrustManager());
     }
     else
@@ -2426,7 +2426,7 @@
             ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
       }
       ctx = Utils.createLdapContext(usedUrl,
-          bindDN, pwd, Utils.getDefaultLDAPTimeout(), null);
+          bindDN, pwd, controlInfo.getConnectTimeout(), null);
     }
 
     checkCanReadConfig(ctx);

--
Gitblit v1.10.0