From db1a3826ba28aa6231756ebd224f16677440ed2e Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 01 Mar 2016 09:43:01 +0000
Subject: [PATCH] OPENDJ-2701 status command using -n fails if no password is provided
---
opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConsoleApplication.java | 26 +-------------------------
1 files changed, 1 insertions(+), 25 deletions(-)
diff --git a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConsoleApplication.java b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConsoleApplication.java
index 6384a43..3e22ef7 100644
--- a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConsoleApplication.java
+++ b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConsoleApplication.java
@@ -556,35 +556,11 @@
* If the port could not be retrieved for some reason.
*/
public final int readPort(LocalizableMessage prompt, final int defaultValue) throws ClientException {
- final ValidationCallback<Integer> callback = new ValidationCallback<Integer>() {
- @Override
- public Integer validate(ConsoleApplication app, String input) throws ClientException {
- final String ninput = input.trim();
- if (ninput.length() == 0) {
- return defaultValue;
- }
-
- try {
- int i = Integer.parseInt(ninput);
- if (i < 1 || i > 65535) {
- throw new NumberFormatException();
- }
- return i;
- } catch (NumberFormatException e) {
- // Try again...
- app.println();
- app.println(ERR_BAD_PORT_NUMBER.get(ninput));
- app.println();
- return null;
- }
- }
-
- };
if (defaultValue != -1) {
prompt = INFO_PROMPT_SINGLE_DEFAULT.get(prompt, defaultValue);
}
- return readValidatedInput(prompt, callback, CONFIRMATION_MAX_TRIES);
+ return readValidatedInput(prompt, Utils.portValidationCallback(defaultValue), CONFIRMATION_MAX_TRIES);
}
/**
--
Gitblit v1.10.0