From 160f2cacf471475fbfce7d9ec0573a224adf1a4c Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Fri, 08 Dec 2006 00:12:35 +0000
Subject: [PATCH] Add a new ds-monitor-entry objectclass to all monitor entries so that they include a structural objectclass.

---
 opends/src/server/org/opends/server/backends/MonitorBackend.java |   19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/opends/src/server/org/opends/server/backends/MonitorBackend.java b/opends/src/server/org/opends/server/backends/MonitorBackend.java
index 15b1089..9e4850e 100644
--- a/opends/src/server/org/opends/server/backends/MonitorBackend.java
+++ b/opends/src/server/org/opends/server/backends/MonitorBackend.java
@@ -222,21 +222,16 @@
 
 
     // Construct the set of objectclasses to include in the base monitor entry.
-    monitorObjectClasses = new HashMap<ObjectClass,String>(2);
-    ObjectClass topOC = DirectoryServer.getObjectClass(OC_TOP);
-    if (topOC == null)
-    {
-      topOC = DirectoryServer.getDefaultObjectClass(OC_TOP);
-    }
+    monitorObjectClasses = new LinkedHashMap<ObjectClass,String>(3);
+    ObjectClass topOC = DirectoryServer.getObjectClass(OC_TOP, true);
     monitorObjectClasses.put(topOC, OC_TOP);
 
+    ObjectClass monitorOC = DirectoryServer.getObjectClass(OC_MONITOR_ENTRY,
+                                                           true);
+    monitorObjectClasses.put(monitorOC, OC_MONITOR_ENTRY);
+
     ObjectClass extensibleObjectOC =
-         DirectoryServer.getObjectClass(OC_EXTENSIBLE_OBJECT);
-    if (extensibleObjectOC == null)
-    {
-      extensibleObjectOC =
-           DirectoryServer.getDefaultObjectClass(OC_EXTENSIBLE_OBJECT);
-    }
+         DirectoryServer.getObjectClass(OC_EXTENSIBLE_OBJECT_LC, true);
     monitorObjectClasses.put(extensibleObjectOC, OC_EXTENSIBLE_OBJECT);
 
 

--
Gitblit v1.10.0