From 744da8ea9d6c0b9acdc19a51f2107fc64e8bfdfe Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 26 Apr 2016 07:54:21 +0000
Subject: [PATCH] Code cleanup in DirectoryServer
---
opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java
index 1af0aef..8132dba 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java
@@ -31,8 +31,8 @@
import java.io.OutputStream;
import java.io.PrintStream;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
-import java.util.concurrent.ConcurrentHashMap;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.ByteString;
@@ -299,7 +299,7 @@
{
if (authPasswordSyntax.isPresent())
{
- listPasswordStorageSchemes(out, err, DirectoryServer.getAuthPasswordStorageSchemes(), true);
+ listPasswordStorageSchemes(out, err, DirectoryServer.getAuthPasswordStorageSchemes().values(), true);
}
else
{
@@ -520,7 +520,7 @@
}
private static void listPasswordStorageSchemes(PrintStream out, PrintStream err,
- ConcurrentHashMap<String, PasswordStorageScheme<?>> storageSchemes, boolean authPasswordSchemeName)
+ Collection<PasswordStorageScheme<?>> storageSchemes, boolean authPasswordSchemeName)
{
if (storageSchemes.isEmpty())
{
@@ -529,7 +529,7 @@
else
{
ArrayList<String> nameList = new ArrayList<>(storageSchemes.size());
- for (PasswordStorageScheme<?> s : storageSchemes.values())
+ for (PasswordStorageScheme<?> s : storageSchemes)
{
if (authPasswordSchemeName)
{
--
Gitblit v1.10.0