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/LDIFBackend.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java
index 1b41013..24e3fe7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java
@@ -533,7 +533,7 @@
}
else
{
- DN parentDN = DirectoryServer.getParentDNInSuffix(entryDN);
+ DN parentDN = serverContext.getBackendConfigManager().getParentDNInSuffix(entryDN);
if (parentDN != null && entryMap.containsKey(parentDN))
{
entryMap.put(entryDN, entry.duplicate(false));
@@ -567,7 +567,7 @@
{
while (true)
{
- parentDN = DirectoryServer.getParentDNInSuffix(parentDN);
+ parentDN = serverContext.getBackendConfigManager().getParentDNInSuffix(parentDN);
if (parentDN == null)
{
return null;
@@ -592,7 +592,7 @@
// Get the DN of the target entry's parent, if it exists. We'll need to
// also remove the reference to the target entry from the parent's set of
// children.
- DN parentDN = DirectoryServer.getParentDNInSuffix(entryDN);
+ DN parentDN = serverContext.getBackendConfigManager().getParentDNInSuffix(entryDN);
// Make sure that the target entry exists. If not, then fail.
if (! entryMap.containsKey(entryDN))
@@ -606,7 +606,7 @@
break;
}
- parentDN = DirectoryServer.getParentDNInSuffix(parentDN);
+ parentDN = serverContext.getBackendConfigManager().getParentDNInSuffix(parentDN);
}
LocalizableMessage m = ERR_LDIF_BACKEND_DELETE_NO_SUCH_ENTRY.get(entryDN);
@@ -711,7 +711,7 @@
if (! entryMap.containsKey(entryDN))
{
DN matchedDN = null;
- DN parentDN = DirectoryServer.getParentDNInSuffix(entryDN);
+ DN parentDN = serverContext.getBackendConfigManager().getParentDNInSuffix(entryDN);
while (parentDN != null)
{
if (entryMap.containsKey(parentDN))
@@ -720,7 +720,7 @@
break;
}
- parentDN = DirectoryServer.getParentDNInSuffix(parentDN);
+ parentDN = serverContext.getBackendConfigManager().getParentDNInSuffix(parentDN);
}
LocalizableMessage m = ERR_LDIF_BACKEND_MODIFY_NO_SUCH_ENTRY.get(entryDN);
@@ -752,7 +752,7 @@
if (! entryMap.containsKey(currentDN))
{
DN matchedDN = null;
- DN parentDN = DirectoryServer.getParentDNInSuffix(currentDN);
+ DN parentDN = serverContext.getBackendConfigManager().getParentDNInSuffix(currentDN);
while (parentDN != null)
{
if (entryMap.containsKey(parentDN))
@@ -761,7 +761,7 @@
break;
}
- parentDN = DirectoryServer.getParentDNInSuffix(parentDN);
+ parentDN = serverContext.getBackendConfigManager().getParentDNInSuffix(parentDN);
}
LocalizableMessage m = ERR_LDIF_BACKEND_MODDN_NO_SUCH_SOURCE_ENTRY.get(currentDN);
@@ -774,7 +774,7 @@
throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, m);
}
- DN newParentDN = DirectoryServer.getParentDNInSuffix(newDN);
+ DN newParentDN = serverContext.getBackendConfigManager().getParentDNInSuffix(newDN);
if (! entryMap.containsKey(newParentDN))
{
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
@@ -783,7 +783,7 @@
// Remove the entry from the list of children for the old parent and
// add the new entry DN to the set of children for the new parent.
- DN oldParentDN = DirectoryServer.getParentDNInSuffix(currentDN);
+ DN oldParentDN = serverContext.getBackendConfigManager().getParentDNInSuffix(currentDN);
Set<DN> parentChildDNs = childDNs.get(oldParentDN);
if (parentChildDNs != null)
{
@@ -887,7 +887,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))
@@ -895,7 +895,7 @@
break;
}
- matchedDN = DirectoryServer.getParentDNInSuffix(matchedDN);
+ matchedDN = serverContext.getBackendConfigManager().getParentDNInSuffix(matchedDN);
}
LocalizableMessage m = ERR_LDIF_BACKEND_SEARCH_NO_SUCH_BASE.get(baseDN);
@@ -1092,7 +1092,7 @@
continue;
}
- DN parentDN = DirectoryServer.getParentDNInSuffix(entryDN);
+ DN parentDN = serverContext.getBackendConfigManager().getParentDNInSuffix(entryDN);
if (parentDN == null || !entryMap.containsKey(parentDN))
{
LocalizableMessage m = ERR_LDIF_BACKEND_MISSING_PARENT.get(
--
Gitblit v1.10.0