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/TrustStoreBackend.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java
index 579eb46..cc88fd9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java
@@ -365,7 +365,7 @@
// See if the requested entry was one level below the backend base entry.
// If so, then it must point to a trust store entry.
- DN parentDN = DirectoryServer.getParentDNInSuffix(entryDN);
+ DN parentDN = serverContext.getBackendConfigManager().getParentDNInSuffix(entryDN);
if (parentDN != null && parentDN.equals(getBaseDN()))
{
try
@@ -458,7 +458,7 @@
throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, message);
}
- DN parentDN = DirectoryServer.getParentDNInSuffix(entryDN);
+ DN parentDN = serverContext.getBackendConfigManager().getParentDNInSuffix(entryDN);
if (parentDN == null)
{
LocalizableMessage message = ERR_TRUSTSTORE_INVALID_BASE.get(entryDN);
@@ -486,7 +486,7 @@
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
- DN parentDN = DirectoryServer.getParentDNInSuffix(entryDN);
+ DN parentDN = serverContext.getBackendConfigManager().getParentDNInSuffix(entryDN);
if (parentDN == null || !parentDN.equals(getBaseDN()))
{
LocalizableMessage message = ERR_TRUSTSTORE_INVALID_BASE.get(entryDN);
@@ -574,7 +574,7 @@
}
}
}
- else if (getBaseDN().equals(DirectoryServer.getParentDNInSuffix(baseDN)))
+ else if (getBaseDN().equals(serverContext.getBackendConfigManager().getParentDNInSuffix(baseDN)))
{
Entry certEntry = getCertEntry(baseDN);
--
Gitblit v1.10.0