From c465af5b01eb04b869326e58bdb3495830dcbb8f Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 01 Mar 2016 09:43:19 +0000
Subject: [PATCH] Fix bug in dsreplication and uninstall cli
---
opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallerArgumentParser.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallerArgumentParser.java b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
index 658b153..c4b6aaa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
@@ -55,7 +55,6 @@
private BooleanArgument removeLDIFFilesArg;
private StringArgument referencedHostNameArg;
- private StringArgument adminUidArg;
/** This CLI is always using the administration connector with SSL. */
private final boolean alwaysSSL = true;
@@ -95,7 +94,6 @@
throws ArgumentException
{
LinkedHashSet<Argument> args = new LinkedHashSet<>();
- adminUidArg = adminUid(INFO_DESCRIPTION_ADMIN_UID.get());
cliArg = cliArgument();
args.add(cliArg);
@@ -162,15 +160,16 @@
args.add(quietArg);
ArrayList<Argument> defaultArgs = new ArrayList<>(createGlobalArguments(outStream, alwaysSSL));
+ secureArgsList.createVisibleAdminUidArgument(INFO_DESCRIPTION_ADMIN_UID.get());
int index = defaultArgs.indexOf(secureArgsList.bindDnArg);
if (index != -1)
{
- defaultArgs.add(index, adminUidArg);
+ defaultArgs.add(index, secureArgsList.adminUidArg);
defaultArgs.remove(secureArgsList.bindDnArg);
}
else
{
- defaultArgs.add(adminUidArg);
+ defaultArgs.add(secureArgsList.adminUidArg);
}
defaultArgs.remove(secureArgsList.hostNameArg);
defaultArgs.remove(secureArgsList.portArg);
@@ -315,7 +314,7 @@
*/
public String getDefaultAdministratorUID()
{
- return adminUidArg.getDefaultValue();
+ return secureArgsList.adminUidArg.getDefaultValue();
}
/**
--
Gitblit v1.10.0