From 39fb26309091c573b915529452d40bd24e97d1f3 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 04 May 2016 08:44:50 +0000
Subject: [PATCH] OPENDJ-2987 DirectoryServer.getDefaultObjectClass() => DirectoryServer.getObjectClass2()
---
opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java | 15 ++-------------
1 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
index 73855c3..abc3f06 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
@@ -220,19 +220,8 @@
// Construct the set of objectclasses to include in the root DSE entry.
dseObjectClasses = new HashMap<>(2);
- ObjectClass topOC = DirectoryServer.getObjectClass(OC_TOP);
- if (topOC == null)
- {
- topOC = DirectoryServer.getDefaultObjectClass(OC_TOP);
- }
- dseObjectClasses.put(topOC, OC_TOP);
-
- ObjectClass rootDSEOC = DirectoryServer.getObjectClass(OC_ROOT_DSE);
- if (rootDSEOC == null)
- {
- rootDSEOC = DirectoryServer.getDefaultObjectClass(OC_ROOT_DSE);
- }
- dseObjectClasses.put(rootDSEOC, OC_ROOT_DSE);
+ dseObjectClasses.put(DirectoryServer.getObjectClass2(OC_TOP), OC_TOP);
+ dseObjectClasses.put(DirectoryServer.getObjectClass2(OC_ROOT_DSE), OC_ROOT_DSE);
// Set the backend ID for this backend. The identifier needs to be
// specific enough to avoid conflict with user backend identifiers.
--
Gitblit v1.10.0