From 327ed7b44629d254f59b785ee2e0b7f8860e5cf8 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 Simplify ways to retrieve an object class from the DirectoryServer Keep only DirectoryServer.getObjectClass() and DirectoryServer.getDefaultObjectClass() methods
---
opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
index 49e0230..f2f2874 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
@@ -247,8 +247,8 @@
// Construct the set of objectclasses to include in the schema entry.
schemaObjectClasses = new LinkedHashMap<>(3);
schemaObjectClasses.put(DirectoryServer.getTopObjectClass(), OC_TOP);
- schemaObjectClasses.put(DirectoryServer.getObjectClass2(OC_LDAP_SUBENTRY_LC), OC_LDAP_SUBENTRY);
- schemaObjectClasses.put(DirectoryServer.getObjectClass2(OC_SUBSCHEMA), OC_SUBSCHEMA);
+ schemaObjectClasses.put(DirectoryServer.getObjectClass(OC_LDAP_SUBENTRY_LC), OC_LDAP_SUBENTRY);
+ schemaObjectClasses.put(DirectoryServer.getObjectClass(OC_SUBSCHEMA), OC_SUBSCHEMA);
configEntryDN = configEntry.getName();
baseDNs = cfg.getBaseDN();
@@ -2603,8 +2603,8 @@
{
Map<ObjectClass,String> objectClasses = new LinkedHashMap<>();
objectClasses.put(DirectoryServer.getTopObjectClass(), OC_TOP);
- objectClasses.put(DirectoryServer.getObjectClass2(OC_LDAP_SUBENTRY_LC), OC_LDAP_SUBENTRY);
- objectClasses.put(DirectoryServer.getObjectClass2(OC_SUBSCHEMA), OC_SUBSCHEMA);
+ objectClasses.put(DirectoryServer.getObjectClass(OC_LDAP_SUBENTRY_LC), OC_LDAP_SUBENTRY);
+ objectClasses.put(DirectoryServer.getObjectClass(OC_SUBSCHEMA), OC_SUBSCHEMA);
Map<AttributeType,List<Attribute>> userAttributes = new LinkedHashMap<>();
Map<AttributeType,List<Attribute>> operationalAttributes = new LinkedHashMap<>();
--
Gitblit v1.10.0