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/jmx/RmiConnector.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiConnector.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiConnector.java
index c94736c..4199b3e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiConnector.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiConnector.java
@@ -32,6 +32,7 @@
import java.rmi.registry.LocateRegistry;
import java.rmi.registry.Registry;
import java.util.HashMap;
+import java.util.SortedSet;
import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLSocketFactory;
@@ -279,26 +280,19 @@
// SERVER SIDE
// ---------------------
// Get a Server socket factory
- KeyManager[] keyManagers;
KeyManagerProvider provider = DirectoryServer
.getKeyManagerProvider(jmxConnectionHandler
.getKeyManagerProviderDN());
+ final KeyManager[] keyManagers;
if (provider == null) {
keyManagers = new NullKeyManagerProvider().getKeyManagers();
}
else
{
- String nickname = jmxConnectionHandler.getSSLServerCertNickname();
- if (nickname == null)
- {
- keyManagers = provider.getKeyManagers();
- }
- else
- {
- keyManagers =
- SelectableCertificateKeyManager.wrap(provider.getKeyManagers(),
- nickname);
- }
+ final SortedSet<String> nicknames = jmxConnectionHandler.getSSLServerCertNicknames();
+ keyManagers = nicknames == null
+ ? provider.getKeyManagers()
+ : SelectableCertificateKeyManager.wrap(provider.getKeyManagers(), nicknames);
}
SSLContext ctx = SSLContext.getInstance("TLSv1");
--
Gitblit v1.10.0