From 81909cf43111e8499c583395b66e96b6b74e6ab9 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Fri, 21 Feb 2014 13:50:22 +0000
Subject: [PATCH] Checkpoint OPENDJ-1343 Migrate dsconfig / OPENDJ-1303 "opendj-cli" - replaced arguments by CLI sdk CommonArguments.(Basic only, riskless to conflicting arguments) - reverted modifications on InstallDS/InstallDSArgumentParser about getDirectoryManagerPassword. - removed from toolconstants 'description' / 'memberName' (unused)
---
opendj3-server-dev/src/server/org/opends/server/tools/InstallDS.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/InstallDS.java b/opendj3-server-dev/src/server/org/opends/server/tools/InstallDS.java
index 482da72..f5a1a4f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/InstallDS.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/InstallDS.java
@@ -722,7 +722,7 @@
errorMessages.add(message);
}
uData.setDirectoryManagerDn(dmDN);
- uData.setDirectoryManagerPwd(String.valueOf(argParser.getDirectoryManagerPassword()));
+ uData.setDirectoryManagerPwd(argParser.getDirectoryManagerPassword());
// Check the validity of the base DNs
List<String> baseDNs = argParser.baseDNArg.getValues();
@@ -978,7 +978,7 @@
true);
uData.setDirectoryManagerDn(dns.getFirst());
- char[] pwd = argParser.getDirectoryManagerPassword();
+ String pwd = argParser.getDirectoryManagerPassword();
int nTries = 0;
while (pwd == null)
{
@@ -1004,9 +1004,9 @@
char[] pwd2 =
readPassword(INFO_INSTALLDS_PROMPT_CONFIRM_ROOT_PASSWORD.get());
- if (pwd1.equals(pwd2))
+ if (Arrays.equals(pwd1, pwd2))
{
- pwd = pwd1;
+ pwd = String.valueOf(pwd1);
}
else
{
--
Gitblit v1.10.0