From 1afeb00abfb007ef9322d2060896353aeb3efdc4 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 30 May 2016 10:43:11 +0000
Subject: [PATCH] OPENDJ-2987 Fix all classes that need to use ObjectClass placeholder instead of null
---
opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java | 10 ++--------
1 files changed, 2 insertions(+), 8 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 53f7255..bcbc0de 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
@@ -143,13 +143,7 @@
// Initialize null entry object classes.
objectClasses = new HashMap<>();
- String topOCName = "top";
- ObjectClass topOC = DirectoryServer.getObjectClass(topOCName);
- if (topOC == null) {
- throw new InitializationException(LocalizableMessage.raw("Unable to locate " + topOCName +
- " objectclass in the current server schema"));
- }
- objectClasses.put(topOC, topOCName);
+ objectClasses.put(DirectoryServer.getTopObjectClass(), "top");
String nulOCName = "nullbackendobject";
ObjectClass nulOC = DirectoryServer.getObjectClass2(nulOCName);
@@ -163,7 +157,7 @@
String extOCName = "extensibleobject";
ObjectClass extOC = DirectoryServer.getObjectClass(extOCName);
- if (extOC == null) {
+ if (extOC.isPlaceHolder()) {
throw new InitializationException(LocalizableMessage.raw("Unable to locate " + extOCName +
" objectclass in the current server schema"));
}
--
Gitblit v1.10.0