From 1932d41262099a16f43749a90677366818b3664c Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 01 Mar 2016 09:44:57 +0000
Subject: [PATCH] OPENDJ-2701 Code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index ee497ca..1446681 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -448,7 +448,7 @@
}
}
- if (argParser.getSecureArgsList().bindPasswordFileArg.isPresent())
+ if (argParser.getSecureArgsList().getBindPasswordFileArg().isPresent())
{
try
{
@@ -458,7 +458,7 @@
.valuePlaceholder(INFO_BINDPWD_FILE_PLACEHOLDER.get())
.buildArgument();
userProvidedAdminPwdFile.getNameToValueMap().putAll(
- argParser.getSecureArgsList().bindPasswordFileArg.getNameToValueMap());
+ argParser.getSecureArgsList().getBindPasswordFileArg().getNameToValueMap());
}
catch (Throwable t)
{
@@ -2150,9 +2150,9 @@
else if (bindDn1 == null)
{
pwd = adminPwd;
- if (argParser.getSecureArgsList().bindPasswordFileArg.isPresent())
+ if (argParser.getSecureArgsList().getBindPasswordFileArg().isPresent())
{
- pwdFile = argParser.getSecureArgsList().bindPasswordFileArg.
+ pwdFile = argParser.getSecureArgsList().getBindPasswordFileArg().
getNameToValueMap();
}
}
@@ -2352,7 +2352,7 @@
uData.getServer1().setSecureReplication(secureReplication1);
uData.getServer1().setConfigureReplicationServer(configureReplicationServer1);
uData.getServer1().setConfigureReplicationDomain(configureReplicationDomain1);
- firstServerCommandBuilder = new CommandBuilder(null, null);
+ firstServerCommandBuilder = new CommandBuilder();
if (mustPrintCommandBuilder())
{
firstServerCommandBuilder.append(sourceServerCI.getCommandBuilder());
@@ -2390,9 +2390,9 @@
{
doNotDisplayFirstError = true;
pwd = adminPwd;
- if (argParser.getSecureArgsList().bindPasswordFileArg.isPresent())
+ if (argParser.getSecureArgsList().getBindPasswordFileArg().isPresent())
{
- pwdFile = argParser.getSecureArgsList().bindPasswordFileArg.
+ pwdFile = argParser.getSecureArgsList().getBindPasswordFileArg().
getNameToValueMap();
}
}
@@ -3138,9 +3138,9 @@
int portSource = argParser.getPortSource();
Map<String, String> pwdFile = null;
- if (argParser.getSecureArgsList().bindPasswordFileArg.isPresent())
+ if (argParser.getSecureArgsList().getBindPasswordFileArg().isPresent())
{
- pwdFile = argParser.getSecureArgsList().bindPasswordFileArg.getNameToValueMap();
+ pwdFile = argParser.getSecureArgsList().getBindPasswordFileArg().getNameToValueMap();
}
/*
@@ -3193,7 +3193,7 @@
uData.setAdminPwd(adminPwd);
}
- firstServerCommandBuilder = new CommandBuilder(null, null);
+ firstServerCommandBuilder = new CommandBuilder();
if (mustPrintCommandBuilder())
{
firstServerCommandBuilder.append(sourceServerCI.getCommandBuilder());
--
Gitblit v1.10.0