From 6276e230cb3cfcbb25f8dfe8123fcfd81d13d83c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 07 Jun 2016 13:50:18 +0000
Subject: [PATCH] OPENDJ-3037 inlined DirectoryServer methods that delegate to the schema
---
opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java
index b530bff..b72707e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java
@@ -16,6 +16,7 @@
*/
package org.opends.server.backends;
+import static org.forgerock.opendj.ldap.schema.CoreSchema.*;
import static org.opends.messages.BackendMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -33,7 +34,6 @@
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.BackendCfg;
import org.opends.server.api.Backend;
@@ -144,10 +144,11 @@
// Initialize null entry object classes.
objectClasses = new HashMap<>();
- objectClasses.put(CoreSchema.getTopObjectClass(), OC_TOP);
+ objectClasses.put(getTopObjectClass(), OC_TOP);
+ objectClasses.put(getExtensibleObjectObjectClass(), "extensibleobject");
String nulOCName = "nullbackendobject";
- ObjectClass nulOC = DirectoryServer.getObjectClass(nulOCName);
+ ObjectClass nulOC = DirectoryServer.getSchema().getObjectClass(nulOCName);
try {
DirectoryServer.getSchema().registerObjectClass(nulOC, new ServerSchemaElement(nulOC).getSchemaFile(), false);
} catch (DirectoryException de) {
@@ -155,14 +156,6 @@
throw new InitializationException(de.getMessageObject());
}
objectClasses.put(nulOC, nulOCName);
-
- String extOCName = "extensibleobject";
- ObjectClass extOC = DirectoryServer.getObjectClass(extOCName);
- if (extOC.isPlaceHolder()) {
- throw new InitializationException(LocalizableMessage.raw("Unable to locate " + extOCName +
- " objectclass in the current server schema"));
- }
- objectClasses.put(extOC, extOCName);
}
@Override
--
Gitblit v1.10.0