From e67fae088ed0915557f53a71f3ce464a651d1e86 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 20 Feb 2015 08:11:35 +0000
Subject: [PATCH] OPENDJ-1827: Fix root password check with setup --cli
---
opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java
index 029df96..7650f67 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java
@@ -964,12 +964,12 @@
ERR_TRIES_LIMIT_REACHED.get(CONFIRMATION_MAX_TRIES));
}
char[] pwd1 = null;
- // Prompt for password and confirm.
+ // Prompt for password and confirm.
while (pwd1 == null)
{
pwd1 = readPassword(INFO_INSTALLDS_PROMPT_ROOT_PASSWORD.get());
- if (pwd1 == null || "".equals(pwd1))
+ if (pwd1 == null || pwd1.length == 0)
{
pwd1 = null;
println();
@@ -977,9 +977,8 @@
println();
}
}
- char[] pwd2 =
- readPassword(INFO_INSTALLDS_PROMPT_CONFIRM_ROOT_PASSWORD.get());
+ char[] pwd2 = readPassword(INFO_INSTALLDS_PROMPT_CONFIRM_ROOT_PASSWORD.get());
if (Arrays.equals(pwd1, pwd2))
{
pwd = String.valueOf(pwd1);
--
Gitblit v1.10.0