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/backends/MemoryBackend.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java
index 68b3fe0..9e7c09f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java
@@ -313,7 +313,7 @@
}
// Get the parent DN and ensure that it exists in the backend.
- DN parentDN = DirectoryServer.getParentDNInSuffix(entryDN);
+ DN parentDN = serverContext.getBackendConfigManager().getParentDNInSuffix(entryDN);
if (parentDN == null)
{
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
@@ -384,7 +384,7 @@
childDNs.remove(entryDN);
entryMap.remove(entryDN);
- DN parentDN = DirectoryServer.getParentDNInSuffix(entryDN);
+ DN parentDN = serverContext.getBackendConfigManager().getParentDNInSuffix(entryDN);
if (parentDN != null)
{
HashSet<DN> parentsChildren = childDNs.get(parentDN);
@@ -461,7 +461,7 @@
}
// Make sure that the parent of the new entry exists.
- DN parentDN = DirectoryServer.getParentDNInSuffix(e.getName());
+ DN parentDN = serverContext.getBackendConfigManager().getParentDNInSuffix(e.getName());
if (parentDN == null || !entryMap.containsKey(parentDN))
{
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
@@ -498,7 +498,7 @@
Entry baseEntry = entryMap.get(baseDN);
if (baseEntry == null && handlesEntry(baseDN))
{
- DN matchedDN = DirectoryServer.getParentDNInSuffix(baseDN);
+ DN matchedDN = serverContext.getBackendConfigManager().getParentDNInSuffix(baseDN);
while (matchedDN != null)
{
if (entryMap.containsKey(matchedDN))
@@ -506,7 +506,7 @@
break;
}
- matchedDN = DirectoryServer.getParentDNInSuffix(matchedDN);
+ matchedDN = serverContext.getBackendConfigManager().getParentDNInSuffix(matchedDN);
}
LocalizableMessage message =
--
Gitblit v1.10.0