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/util/StaticUtils.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
index 7bbb3cf..fc0d4d9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
@@ -58,6 +58,7 @@
import org.forgerock.opendj.ldap.RDN;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.CoreSchema;
+import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.forgerock.util.Reject;
import org.opends.messages.ToolMessages;
import org.opends.server.core.DirectoryServer;
@@ -66,7 +67,6 @@
import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.Entry;
import org.opends.server.types.IdentifiedException;
-import org.forgerock.opendj.ldap.schema.ObjectClass;
import com.forgerock.opendj.cli.Argument;
import com.forgerock.opendj.cli.ArgumentException;
@@ -1971,8 +1971,7 @@
// then we'll need to include the extensibleObject class.
if (!structuralClass.isRequiredOrOptional(attrType) && !extensibleObjectAdded)
{
- ObjectClass extensibleObjectOC = DirectoryServer.getObjectClass(OC_EXTENSIBLE_OBJECT_LC);
- objectClasses.put(extensibleObjectOC, OC_EXTENSIBLE_OBJECT);
+ objectClasses.put(CoreSchema.getTopObjectClass(), OC_EXTENSIBLE_OBJECT);
extensibleObjectAdded = true;
}
--
Gitblit v1.10.0