From 6ba31b40d37b5026c1da21d797321d73df375e27 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 04 May 2016 08:44:30 +0000
Subject: [PATCH] OPENDJ-2987 DirectoryServer.getObjectClass(String, true) => DirectoryServer.getObjectClass2(String)
---
opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 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 1fbfc0f..0ee9e6e 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
@@ -193,12 +193,8 @@
addAll(userDefinedAttributes, configEntry.getOperationalAttributes().values());
// Construct the set of objectclasses to include in the base monitor entry.
- final ObjectClass topOC = DirectoryServer.getObjectClass(OC_TOP, true);
- monitorObjectClasses.put(topOC, OC_TOP);
-
- final ObjectClass monitorOC = DirectoryServer.getObjectClass(
- OC_MONITOR_ENTRY, true);
- monitorObjectClasses.put(monitorOC, OC_MONITOR_ENTRY);
+ monitorObjectClasses.put(DirectoryServer.getObjectClass2(OC_TOP), OC_TOP);
+ monitorObjectClasses.put(DirectoryServer.getObjectClass2(OC_MONITOR_ENTRY), OC_MONITOR_ENTRY);
// Create the set of base DNs that we will handle. In this case, it's just
// the DN of the base monitor entry.
@@ -564,7 +560,7 @@
*/
private Entry getBaseMonitorEntry()
{
- final ObjectClass extensibleObjectOC = DirectoryServer.getObjectClass(OC_EXTENSIBLE_OBJECT_LC, true);
+ final ObjectClass extensibleObjectOC = DirectoryServer.getObjectClass2(OC_EXTENSIBLE_OBJECT_LC);
final HashMap<ObjectClass, String> monitorClasses = newObjectClasses(extensibleObjectOC, OC_EXTENSIBLE_OBJECT);
final HashMap<AttributeType, List<Attribute>> monitorUserAttrs = new LinkedHashMap<>();
@@ -635,7 +631,7 @@
*/
private Entry getBranchMonitorEntry(final DN dn)
{
- final ObjectClass monitorOC = DirectoryServer.getObjectClass(OC_MONITOR_BRANCH, true);
+ final ObjectClass monitorOC = DirectoryServer.getObjectClass2(OC_MONITOR_BRANCH);
final HashMap<ObjectClass, String> monitorClasses = newObjectClasses(monitorOC, OC_MONITOR_BRANCH);
final HashMap<AttributeType, List<Attribute>> monitorUserAttrs = new LinkedHashMap<>();
--
Gitblit v1.10.0