From 27d0166838277ad2f51a18aecdec2c781d8220ba Mon Sep 17 00:00:00 2001
From: abobrov <abobrov@localhost>
Date: Wed, 05 Dec 2007 18:12:13 +0000
Subject: [PATCH] - [Issue 2658] entry cache : unexpected behavior under cn=monitor. make sure each entry cache monitor has its unique name.
---
opends/src/server/org/opends/server/core/EntryCacheConfigManager.java | 6 +++---
opends/src/server/org/opends/server/monitors/EntryCacheMonitorProvider.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/EntryCacheConfigManager.java b/opends/src/server/org/opends/server/core/EntryCacheConfigManager.java
index b0eede9..c803931 100644
--- a/opends/src/server/org/opends/server/core/EntryCacheConfigManager.java
+++ b/opends/src/server/org/opends/server/core/EntryCacheConfigManager.java
@@ -542,9 +542,9 @@
_defaultEntryCache.setCacheOrder(cacheOrderMap);
// Install and register the monitor for this cache.
- EntryCacheMonitorProvider monitor = new EntryCacheMonitorProvider(
- configuration.definition().getUserFriendlyName().toString(),
- entryCache);
+ EntryCacheMonitorProvider monitor =
+ new EntryCacheMonitorProvider(configuration.dn().
+ getRDN().getAttributeValue(0).toString(), entryCache);
try {
monitor.initializeMonitorProvider((EntryCacheMonitorProviderCfg)
rootConfiguration.getMonitorProvider(
diff --git a/opends/src/server/org/opends/server/monitors/EntryCacheMonitorProvider.java b/opends/src/server/org/opends/server/monitors/EntryCacheMonitorProvider.java
index bdef0f1..62c4a15 100644
--- a/opends/src/server/org/opends/server/monitors/EntryCacheMonitorProvider.java
+++ b/opends/src/server/org/opends/server/monitors/EntryCacheMonitorProvider.java
@@ -85,7 +85,7 @@
EntryCache<? extends EntryCacheCfg> entryCache)
{
super(entryCacheName + " Entry Cache Monitor Provider");
- this.entryCacheName = entryCacheName;
+ this.entryCacheName = entryCacheName + " Entry Cache";
this.entryCache = entryCache;
}
--
Gitblit v1.10.0