From ff3d9f4d66359580bd48d255a86a7e2099d7ed4f Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Fri, 30 Jul 2010 15:32:42 +0000
Subject: [PATCH] Ldaptools should not timeout by default when processing operations (some delete or searches may take a long time, especially subtree deletes and persistent searches).
---
opends/src/server/org/opends/server/tools/LDAPSearch.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/LDAPSearch.java b/opends/src/server/org/opends/server/tools/LDAPSearch.java
index 433db65..77ab115 100644
--- a/opends/src/server/org/opends/server/tools/LDAPSearch.java
+++ b/opends/src/server/org/opends/server/tools/LDAPSearch.java
@@ -25,7 +25,7 @@
* Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.server.tools;
-import org.opends.admin.ads.util.ConnectionUtils;
+
import org.opends.messages.Message;
import java.io.BufferedReader;
@@ -83,13 +83,13 @@
private List<Control> responseControls;
// The message ID counter to use for requests.
- private AtomicInteger nextMessageID;
+ private final AtomicInteger nextMessageID;
// The print stream to use for standard error.
- private PrintStream err;
+ private final PrintStream err;
// The print stream to use for standard output.
- private PrintStream out;
+ private final PrintStream out;
@@ -1022,11 +1022,10 @@
version.setPropertyName(OPTION_LONG_PROTOCOL_VERSION);
argParser.addArgument(version);
- int defaultTimeout = ConnectionUtils.getDefaultLDAPTimeout();
connectTimeout = new IntegerArgument(OPTION_LONG_CONNECT_TIMEOUT,
null, OPTION_LONG_CONNECT_TIMEOUT,
false, false, true, INFO_TIMEOUT_PLACEHOLDER.get(),
- defaultTimeout, null,
+ 0, null,
true, 0, false, Integer.MAX_VALUE,
INFO_DESCRIPTION_CONNECTION_TIMEOUT.get());
connectTimeout.setPropertyName(OPTION_LONG_CONNECT_TIMEOUT);
--
Gitblit v1.10.0