From aa2e7c321ca330792a6c2a7c41efd923bb1270af Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 04 Jun 2013 14:15:10 +0000
Subject: [PATCH] Initial work for re-opened OPENDJ-866: Local RS is named differently to remote RS under.
---
opends/src/server/org/opends/server/core/DirectoryServer.java | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/DirectoryServer.java b/opends/src/server/org/opends/server/core/DirectoryServer.java
index fd743ff..096678c 100644
--- a/opends/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opends/src/server/org/opends/server/core/DirectoryServer.java
@@ -5603,17 +5603,18 @@
/**
- * Deregisters the specified monitor provider from the Directory Server. If
- * no such monitor provider is registered, no action will be taken.
+ * Deregisters the specified monitor provider from the Directory Server. If no
+ * such monitor provider is registered, no action will be taken.
*
- * @param lowerName The name of the monitor provider to deregister, in all
- * lowercase characters.
+ * @param monitorProvider
+ * The monitor provider to deregister from the Directory Server.
*/
- public static void deregisterMonitorProvider(String lowerName)
+ public static void deregisterMonitorProvider(
+ MonitorProvider<? extends MonitorProviderCfg> monitorProvider)
{
- MonitorProvider provider =
- directoryServer.monitorProviders.remove(toLowerCase(lowerName));
-
+ String monitorName = toLowerCase(monitorProvider.getMonitorInstanceName());
+ MonitorProvider<?> provider = directoryServer.monitorProviders
+ .remove(monitorName);
// Try to deregister the monitor provider as an MBean.
if (provider != null)
@@ -6339,8 +6340,7 @@
BackendMonitor monitor = backend.getBackendMonitor();
if (monitor != null)
{
- String instanceName = toLowerCase(monitor.getMonitorInstanceName());
- deregisterMonitorProvider(instanceName);
+ deregisterMonitorProvider(monitor);
monitor.finalizeMonitorProvider();
backend.setBackendMonitor(null);
}
@@ -7218,8 +7218,7 @@
ConnectionHandlerMonitor monitor = handler.getConnectionHandlerMonitor();
if (monitor != null)
{
- String instanceName = toLowerCase(monitor.getMonitorInstanceName());
- deregisterMonitorProvider(instanceName);
+ deregisterMonitorProvider(monitor);
monitor.finalizeMonitorProvider();
handler.setConnectionHandlerMonitor(null);
}
@@ -9691,20 +9690,16 @@
public static DN getMonitorProviderDN(MonitorProvider provider)
{
String monitorName = provider.getMonitorInstanceName();
- getAttributeType(ATTR_COMMON_NAME);
- DN monitorRootDN;
try
{
// Get a complete DN which could be a tree naming schema
- monitorRootDN = DN.decode("cn="+monitorName+","+DN_MONITOR_ROOT);
+ return DN.decode("cn="+monitorName+","+DN_MONITOR_ROOT);
}
catch (DirectoryException e)
{
// Cannot reach this point.
throw new RuntimeException();
}
-
- return monitorRootDN;
}
--
Gitblit v1.10.0