From d7394bfd15ee7b9d27d189cf268b13f8913728b7 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Thu, 03 Mar 2016 16:28:08 +0000
Subject: [PATCH] Minor fix for dsreplication cli

---
 opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java
index 07e01a4..0521d1a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java
@@ -286,10 +286,8 @@
   {
     int returnValue;
     super.validateGlobalOptions(buf);
-    final List<LocalizableMessage> errors = new ArrayList<>();
-    addErrorMessageIfArgumentsConflict(
-        errors, secureArgsList.getBindPasswordArg(), secureArgsList.getBindPasswordFileArg());
 
+    final List<LocalizableMessage> errors = new ArrayList<>();
     // Check that we can write on the provided path where we write the
     // equivalent non-interactive commands.
     if (equivalentCommandFileArgument.isPresent())

--
Gitblit v1.10.0