From 0d829df01c2615cacccea21e7a47cf347e36f4ae Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Sun, 16 Jul 2006 05:34:29 +0000
Subject: [PATCH] Update the JMX connection handler to eliminate an incorrect and misleading message about a missing key manager configuration entry if SSL was not enabled.

---
 opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
index c660098..22c6e88 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
@@ -427,8 +427,15 @@
     sslServerCertNickname = sslServerCertNickNameAtt.activeValue();
 
     //
-    // Get the KeyManager, if specified,
-    jmxKeyManager = getJmxKeyManager(configEntryDN);
+    // Get the KeyManager, if specified.
+    if (useSSL)
+    {
+      jmxKeyManager = getJmxKeyManager(configEntryDN);
+    }
+    else
+    {
+      jmxKeyManager = null;
+    }
 
     // Create the associated RMI Connector
     rmiConnector = new RmiConnector(DirectoryServer.getJMXMBeanServer(), this);

--
Gitblit v1.10.0