From f5f7aec63906ffc084de9a79d95f1016ac6276bb Mon Sep 17 00:00:00 2001
From: jcambon <jcambon@localhost>
Date: Tue, 12 May 2009 13:18:37 +0000
Subject: [PATCH] Partial Fix for issue #3938 : dsconfig is really too slow in non-interactive mode, almost unusable on Niagara systems
---
opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java b/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
index 64bed3d..228c780 100644
--- a/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
+++ b/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
@@ -59,6 +59,7 @@
import java.util.LinkedHashSet;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLHandshakeException;
+import org.opends.server.tools.ToolConstants;
/**
@@ -79,6 +80,9 @@
// This CLI is always using the administration connector with SSL
private boolean alwaysSSL = false;
+ // Raw arguments
+ private String[] rawArgs = null;
+
/**
* Creates a new LDAP management context factory.
*
@@ -323,7 +327,13 @@
return context;
}
+ /**
+ * {@inheritDoc}
+ */
+ public void setRawArguments(String[] args) {
+ this.rawArgs = args;
+ }
/**
* {@inheritDoc}
@@ -343,7 +353,16 @@
try
{
- secureArgsList.initArgumentsWithConfiguration();
+ if (rawArgs != null) {
+ for (String rawArg : rawArgs) {
+ if (rawArg.contains(ToolConstants.OPTION_LONG_HELP) ||
+ (rawArg.charAt(1) == ToolConstants.OPTION_SHORT_HELP) || (rawArg.
+ charAt(1) == '?')) {
+ // used for usage default values only
+ secureArgsList.initArgumentsWithConfiguration();
+ }
+ }
+ }
}
catch (ConfigException ce)
{
--
Gitblit v1.10.0