From a83810318cb1493e9034dc7c7cebac054aff1b5b Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 09 Sep 2016 09:45:23 +0000
Subject: [PATCH] OPENDJ-3089 OPENDJ-1237 Remove static calls to DirectoryServer.getSchema() in SchemaBackend
---
opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java | 9 +++++----
1 files changed, 5 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 573058e..43f36c3 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
@@ -188,8 +188,9 @@
// Construct the set of objectclasses to include in the schema entry.
schemaObjectClasses = new LinkedHashMap<>(3);
schemaObjectClasses.put(CoreSchema.getTopObjectClass(), OC_TOP);
- schemaObjectClasses.put(DirectoryServer.getSchema().getObjectClass(OC_LDAP_SUBENTRY_LC), OC_LDAP_SUBENTRY);
- schemaObjectClasses.put(DirectoryServer.getSchema().getObjectClass(OC_SUBSCHEMA), OC_SUBSCHEMA);
+ Schema schema = schemaHandler.getSchema();
+ schemaObjectClasses.put(schema.getObjectClass(OC_LDAP_SUBENTRY_LC), OC_LDAP_SUBENTRY);
+ schemaObjectClasses.put(schema.getObjectClass(OC_SUBSCHEMA), OC_SUBSCHEMA);
configEntryDN = configEntry.getName();
baseDNs = cfg.getBaseDN();
@@ -374,7 +375,7 @@
}
/* Add the schema definition attributes. */
- Schema schema = serverContext.getSchemaNG();
+ Schema schema = schemaHandler.getSchema();
buildSchemaAttribute(schema.getAttributeTypes(), userAttrs,
operationalAttrs, attributeTypesType, includeSchemaFile,
AttributeTypeSyntax.isStripSyntaxMinimumUpperBound(),
@@ -422,7 +423,7 @@
userAttrs, operationalAttrs);
// Add the extra attributes.
- for (Attribute attribute : DirectoryServer.getSchema().getExtraAttributes())
+ for (Attribute attribute : schemaHandler.getExtraAttributes())
{
addAttributeToSchemaEntry(attribute, userAttrs, operationalAttrs);
}
--
Gitblit v1.10.0