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/JmxConnectionHandler.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java
index 56cbab2..8e1201e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java
@@ -36,6 +36,7 @@
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
+import java.util.SortedSet;
import java.util.concurrent.CopyOnWriteArrayList;
import org.forgerock.i18n.LocalizableMessage;
@@ -175,7 +176,7 @@
}
- private boolean notEqualsNotNull(String o1, String o2)
+ private <T> boolean notEqualsNotNull(T o1, T o2)
{
return o1 != null && !o1.equals(o2);
}
@@ -284,13 +285,13 @@
/**
- * Retrieves the nickname of the server certificate that should be
+ * Retrieves the nicknames of the server certificates that should be
* used in conjunction with this JMX connection handler.
*
- * @return The nickname of the server certificate that should be
+ * @return The nicknames of the server certificates that should be
* used in conjunction with this JMX connection handler.
*/
- public String getSSLServerCertNickname() {
+ public SortedSet<String> getSSLServerCertNicknames() {
return currentConfig.getSSLCertNickname();
}
--
Gitblit v1.10.0