From 97050c54efee9d0cc89afb5fb61b9a1c67f73f6a Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 16 Nov 2016 19:28:22 +0000
Subject: [PATCH] OPENDJ-3460 Improve management of subordinate backend and naming contexts
---
opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
index fa785df..0a7994b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -18,6 +18,8 @@
package org.opends.server.plugins;
import static org.opends.messages.PluginMessages.*;
+import static org.opends.server.core.BackendConfigManager.NamingContextFilter.PUBLIC;
+import static org.opends.server.core.BackendConfigManager.NamingContextFilter.TOP_LEVEL;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
import static org.opends.server.protocols.internal.Requests.*;
import static org.opends.server.schema.SchemaConstants.*;
@@ -276,9 +278,11 @@
}
Set<DN> cfgBaseDNs = pluginCfg.getBaseDN();
+ BackendConfigManager backendConfigManager =
+ DirectoryServer.getInstance().getServerContext().getBackendConfigManager();
if (cfgBaseDNs == null || cfgBaseDNs.isEmpty())
{
- cfgBaseDNs = DirectoryServer.getPublicNamingContexts().keySet();
+ cfgBaseDNs = backendConfigManager.getNamingContexts(PUBLIC, TOP_LEVEL);
}
// Iterate through all of the defined attribute types and ensure that they
@@ -296,11 +300,9 @@
type.getSyntax().getName()));
}
- BackendConfigManager backendConfigManager =
- DirectoryServer.getInstance().getServerContext().getBackendConfigManager();
for (DN baseDN : cfgBaseDNs)
{
- LocalBackend<?> b = backendConfigManager.getLocalBackend(baseDN);
+ LocalBackend<?> b = backendConfigManager.findLocalBackendForEntry(baseDN);
if (b != null && !b.isIndexed(type, IndexType.EQUALITY))
{
isAcceptable = false;
@@ -597,7 +599,8 @@
{
if (baseDNs.isEmpty())
{
- return DirectoryServer.getPublicNamingContexts().keySet();
+ return DirectoryServer.getInstance().getServerContext().getBackendConfigManager()
+ .getNamingContexts(PUBLIC, TOP_LEVEL);
}
return baseDNs;
}
@@ -1149,7 +1152,8 @@
if (baseDNs.isEmpty())
{
- baseDNs = DirectoryServer.getPublicNamingContexts().keySet();
+ baseDNs = DirectoryServer.getInstance().getServerContext().getBackendConfigManager()
+ .getNamingContexts(PUBLIC, TOP_LEVEL);
}
for (DN baseDN : baseDNs)
--
Gitblit v1.10.0