From 3344d072e292d46c6c81e483fafc711449b3fb40 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 10 Mar 2016 15:06:58 +0000
Subject: [PATCH] OPENDJ-2760 run control panel with user and password broken

---
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java
index 661514f..fd0bfcb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java
@@ -145,7 +145,7 @@
     {
       errorMessages.add(ae.getMessageObject());
     }
-    addErrorMessageIfArgumentsConflict(errorMessages, bindPasswordArg, bindPasswordArg);
+    addErrorMessageIfArgumentsConflict(errorMessages, bindPasswordArg, bindPasswordFileArg);
 
     if (!errorMessages.isEmpty())
     {

--
Gitblit v1.10.0