From aaf1f09351c43d52009c6b53b93eb153ace8428e Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 07 Nov 2016 15:05:30 +0000
Subject: [PATCH] OPENDJ-3417 Remove several backend-related methods from DirectoryServer class
---
opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java
index c0fee94..b53c32d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java
@@ -36,6 +36,7 @@
import org.forgerock.opendj.server.config.server.IdentityMapperCfg;
import org.opends.server.api.LocalBackend;
import org.opends.server.api.IdentityMapper;
+import org.opends.server.core.BackendConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
@@ -107,11 +108,13 @@
cfgBaseDNs = DirectoryServer.getPublicNamingContexts().keySet();
}
+ BackendConfigManager backendConfigManager =
+ DirectoryServer.getInstance().getServerContext().getBackendConfigManager();
for (AttributeType t : attributeTypes)
{
for (DN baseDN : cfgBaseDNs)
{
- LocalBackend b = DirectoryServer.getLocalBackend(baseDN);
+ LocalBackend<?> b = backendConfigManager.getLocalBackend(baseDN);
if (b != null && ! b.isIndexed(t, IndexType.EQUALITY))
{
throw new ConfigException(ERR_EXACTMAP_ATTR_UNINDEXED.get(
@@ -270,11 +273,13 @@
cfgBaseDNs = DirectoryServer.getPublicNamingContexts().keySet();
}
+ BackendConfigManager backendConfigManager =
+ DirectoryServer.getInstance().getServerContext().getBackendConfigManager();
for (AttributeType t : configuration.getMatchAttribute())
{
for (DN baseDN : cfgBaseDNs)
{
- LocalBackend b = DirectoryServer.getLocalBackend(baseDN);
+ LocalBackend<?> b = backendConfigManager.getLocalBackend(baseDN);
if (b != null && ! b.isIndexed(t, IndexType.EQUALITY))
{
unacceptableReasons.add(ERR_EXACTMAP_ATTR_UNINDEXED.get(
--
Gitblit v1.10.0