From ba07fc549fdcfe6d30524daf17ad33832b0efc75 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 11 Mar 2014 09:18:47 +0000
Subject: [PATCH] EntryContainer.java: Matt said we can get rid of the KeyReverseComparator: "It is not used any more, but has been kept for backwards compatibility with OpenDS 2.2 (the comparator is persisted in the JE database)"
---
opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java b/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
index 822f17d..ca0a504 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
@@ -156,17 +156,13 @@
protected String getBindPassword(String dn, OutputStream out,
OutputStream err, StringArgument pwdArg, FileBasedArgument fileArg)
{
- String bindPasswordValue = null;
if (fileArg.isPresent())
{
return fileArg.getValue();
}
- else if (pwdArg.isPresent())
- {
- bindPasswordValue = pwdArg.getValue();
- }
- if ((bindPasswordValue != null && "-".equals(bindPasswordValue))
- || bindPasswordValue == null)
+
+ String bindPasswordValue = pwdArg.isPresent() ? pwdArg.getValue() : null;
+ if (bindPasswordValue == null || "-".equals(bindPasswordValue))
{
// Read the password from the STDin.
try
@@ -267,7 +263,6 @@
setNoPropertiesFileArgument(noPropertiesFileArg);
set.add(noPropertiesFileArg);
-
return set;
}
@@ -296,7 +291,6 @@
ArgumentGroup argGroup)
throws ArgumentException
{
-
for (Argument arg : args)
{
addGlobalArgument(arg, argGroup);
--
Gitblit v1.10.0