From 11798970cffa90c589f0f663bffbba3ca431f43b Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 30 May 2016 10:43:10 +0000
Subject: [PATCH] OPENDJ-2987 Fix DirectoryServer#getTopObjectClass()
---
opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java | 20 ++------------------
opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFReader.java | 2 +-
2 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
index 51dfa06..b2ebdf4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
@@ -74,6 +74,7 @@
import org.forgerock.opendj.ldap.schema.CoreSchema;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.forgerock.opendj.ldap.schema.MatchingRuleUse;
+import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.forgerock.opendj.ldap.schema.ObjectClassType;
import org.forgerock.opendj.ldap.schema.Syntax;
import org.forgerock.opendj.ldap.schema.UnknownSchemaElementException;
@@ -161,7 +162,6 @@
import org.opends.server.types.LockManager;
import org.opends.server.types.Modification;
import org.opends.server.types.NameForm;
-import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.opends.server.types.Operation;
import org.opends.server.types.Privilege;
import org.opends.server.types.RestoreConfig;
@@ -2453,23 +2453,7 @@
*/
public static ObjectClass getTopObjectClass()
{
- ObjectClass objectClass =
- directoryServer.schema.getObjectClass(TOP_OBJECTCLASS_NAME);
- if (objectClass == null)
- {
- String definition =
- "( 2.5.6.0 NAME 'top' ABSTRACT MUST objectClass " +
- "X-ORIGIN 'RFC 2256' )";
-
- objectClass = new ObjectClass(definition, TOP_OBJECTCLASS_NAME,
- Collections.singleton(TOP_OBJECTCLASS_NAME),
- TOP_OBJECTCLASS_OID,
- TOP_OBJECTCLASS_DESCRIPTION, null, null,
- null, ObjectClassType.ABSTRACT, false,
- null);
- }
-
- return objectClass;
+ return directoryServer.schema.getObjectClass(TOP_OBJECTCLASS_NAME);
}
/**
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFReader.java b/opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFReader.java
index 11b9ca9..83ac684 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFReader.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFReader.java
@@ -172,7 +172,7 @@
TestCaseUtils.startServer();
// Initialize schema bits.
- OC_TOP = DirectoryServer.getObjectClass("top");
+ OC_TOP = DirectoryServer.getTopObjectClass();
OC_PERSON = DirectoryServer.getObjectClass("person");
AT_OC = DirectoryServer.getObjectClassAttributeType();
--
Gitblit v1.10.0