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/task/TaskBackend.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskBackend.java
index f000dbf..4ce5668 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskBackend.java
@@ -352,7 +352,7 @@
       return taskScheduler.getRecurringTaskCount();
     }
 
-    DN parentDN = DirectoryServer.getParentDNInSuffix(entryDN);
+    DN parentDN = serverContext.getBackendConfigManager().getParentDNInSuffix(entryDN);
     if (parentDN == null)
     {
       return -1;
@@ -399,7 +399,7 @@
         return taskScheduler.getRecurringTaskParentEntry();
       }
 
-      DN parentDN = DirectoryServer.getParentDNInSuffix(entryDN);
+      DN parentDN = serverContext.getBackendConfigManager().getParentDNInSuffix(entryDN);
       if (parentDN == null)
       {
         return null;
@@ -434,7 +434,7 @@
 
     // Get the DN for the entry and then get its parent.
     DN entryDN = e.getName();
-    DN parentDN = DirectoryServer.getParentDNInSuffix(entryDN);
+    DN parentDN = serverContext.getBackendConfigManager().getParentDNInSuffix(entryDN);
 
     if (parentDN == null)
     {
@@ -473,7 +473,7 @@
   {
     // Get the parent for the provided entry DN.  It must be either the
     // scheduled or recurring task parent DN.
-    DN parentDN = DirectoryServer.getParentDNInSuffix(entryDN);
+    DN parentDN = serverContext.getBackendConfigManager().getParentDNInSuffix(entryDN);
     if (parentDN == null)
     {
       LocalizableMessage message = ERR_TASKBE_DELETE_INVALID_ENTRY.get(entryDN);
@@ -558,7 +558,7 @@
     {
       // Get the parent for the provided entry DN.  It must be either the
       // scheduled or recurring task parent DN.
-      DN parentDN = DirectoryServer.getParentDNInSuffix(entryDN);
+      DN parentDN = serverContext.getBackendConfigManager().getParentDNInSuffix(entryDN);
       if (parentDN == null)
       {
         LocalizableMessage message = ERR_TASKBE_MODIFY_INVALID_ENTRY.get(entryDN);
@@ -803,7 +803,7 @@
     }
     else
     {
-      DN parentDN = DirectoryServer.getParentDNInSuffix(baseDN);
+      DN parentDN = serverContext.getBackendConfigManager().getParentDNInSuffix(baseDN);
       if (parentDN == null)
       {
         LocalizableMessage message = ERR_TASKBE_SEARCH_INVALID_BASE.get(baseDN);

--
Gitblit v1.10.0