From c9be76aa5748caa7e04fd35386eb08b5c40d968a Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <ylecaillez@forgerock.com>
Date: Mon, 12 Oct 2015 09:34:55 +0000
Subject: [PATCH] OPENDJ-1959: Duplicated WARNING messages
---
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
index bca67f2..b358ea2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
@@ -1422,21 +1422,29 @@
disableAndWarnIfUseSSL(config);
}
- String alias = config.getSSLCertNickname();
- KeyManager[] keyManagers;
- if (alias == null)
+ final SortedSet<String> aliases = new TreeSet<>(config.getSSLCertNickname());
+ final KeyManager[] keyManagers;
+ if (aliases.isEmpty())
{
keyManagers = keyManagerProvider.getKeyManagers();
}
else
{
- if (!keyManagerProvider.containsKeyWithAlias(alias))
+ final Iterator<String> it = aliases.iterator();
+ while (it.hasNext())
{
- logger.error(ERR_KEYSTORE_DOES_NOT_CONTAIN_ALIAS, alias, friendlyName);
+ if (!keyManagerProvider.containsKeyWithAlias(it.next()))
+ {
+ logger.error(ERR_KEYSTORE_DOES_NOT_CONTAIN_ALIAS, aliases, friendlyName);
+ it.remove();
+ }
+ }
+
+ if (aliases.isEmpty())
+ {
disableAndWarnIfUseSSL(config);
}
- keyManagers = SelectableCertificateKeyManager.wrap(
- keyManagerProvider.getKeyManagers(), alias, friendlyName);
+ keyManagers = SelectableCertificateKeyManager.wrap(keyManagerProvider.getKeyManagers(), aliases, friendlyName);
}
DN trustMgrDN = config.getTrustManagerProviderDN();
@@ -1462,8 +1470,6 @@
}
}
-
-
/**
* Enqueue a connection finalizer which will be invoked after a short delay.
*
--
Gitblit v1.10.0