From 28a42606324662f6a73c9dcc882937f85535619e Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 07 Jun 2016 13:49:04 +0000
Subject: [PATCH] fixup top / extensibleObject
---
opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
index b3f329f..eb5952d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
@@ -49,6 +49,8 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
+import org.forgerock.opendj.ldap.schema.CoreSchema;
+import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.forgerock.opendj.server.config.server.MonitorBackendCfg;
import org.forgerock.util.Reject;
import org.opends.server.api.Backend;
@@ -72,7 +74,6 @@
import org.opends.server.types.LDIFExportConfig;
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.LDIFImportResult;
-import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.opends.server.types.RestoreConfig;
import org.opends.server.types.SearchFilter;
import org.opends.server.util.DynamicConstants;
@@ -193,7 +194,7 @@
addAll(userDefinedAttributes, configEntry.getOperationalAttributes().values());
// Construct the set of objectclasses to include in the base monitor entry.
- monitorObjectClasses.put(DirectoryServer.getObjectClass(OC_TOP), OC_TOP);
+ monitorObjectClasses.put(CoreSchema.getTopObjectClass(), OC_TOP);
monitorObjectClasses.put(DirectoryServer.getObjectClass(OC_MONITOR_ENTRY), OC_MONITOR_ENTRY);
// Create the set of base DNs that we will handle. In this case, it's just
@@ -560,7 +561,7 @@
*/
private Entry getBaseMonitorEntry()
{
- final ObjectClass extensibleObjectOC = DirectoryServer.getObjectClass(OC_EXTENSIBLE_OBJECT_LC);
+ final ObjectClass extensibleObjectOC = CoreSchema.getExtensibleObjectObjectClass();
final HashMap<ObjectClass, String> monitorClasses = newObjectClasses(extensibleObjectOC, OC_EXTENSIBLE_OBJECT);
final HashMap<AttributeType, List<Attribute>> monitorUserAttrs = new LinkedHashMap<>();
--
Gitblit v1.10.0