From 33047cc2802d7174ad06bc62e972bc9a876abe99 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 25 Nov 2016 09:17:03 +0000
Subject: [PATCH] Inlined DirectoryServer.getSchema()
---
opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
index 69c810f..2940b2e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
@@ -178,7 +178,7 @@
static
{
CHANGELOG_ROOT_OBJECT_CLASSES.put(CoreSchema.getTopObjectClass(), OC_TOP);
- CHANGELOG_ROOT_OBJECT_CLASSES.put(DirectoryServer.getSchema().getObjectClass("container"), "container");
+ CHANGELOG_ROOT_OBJECT_CLASSES.put(DirectoryServer.getInstance().getServerContext().getSchema().getObjectClass("container"), "container");
}
/** The set of objectclasses that will be used in ECL entries. */
@@ -187,7 +187,7 @@
static
{
CHANGELOG_ENTRY_OBJECT_CLASSES.put(CoreSchema.getTopObjectClass(), OC_TOP);
- CHANGELOG_ENTRY_OBJECT_CLASSES.put(getSchema().getObjectClass(OC_CHANGELOG_ENTRY), OC_CHANGELOG_ENTRY);
+ CHANGELOG_ENTRY_OBJECT_CLASSES.put(getInstance().getServerContext().getSchema().getObjectClass(OC_CHANGELOG_ENTRY), OC_CHANGELOG_ENTRY);
}
/** The base DN for the external change log. */
@@ -695,7 +695,7 @@
private SearchFilter buildSearchFilterFrom(final DN baseDN, final String attrName)
{
final RDN rdn = baseDN.rdn();
- AttributeType attrType = DirectoryServer.getSchema().getAttributeType(attrName);
+ AttributeType attrType = DirectoryServer.getInstance().getServerContext().getSchema().getAttributeType(attrName);
final ByteString attrValue = rdn.getAttributeValue(attrType);
if (attrValue != null)
{
@@ -1472,7 +1472,7 @@
final Map<AttributeType, List<Attribute>> operationalAttrs, final boolean addByType)
{
final Attribute a = addByType
- ? Attributes.create(getSchema().getAttributeType(attrName), attrValue)
+ ? Attributes.create(getInstance().getServerContext().getSchema().getAttributeType(attrName), attrValue)
: Attributes.create(attrName, attrValue);
final AttributeType attrType = a.getAttributeDescription().getAttributeType();
final List<Attribute> attrList = Collections.singletonList(a);
--
Gitblit v1.10.0