From c70f83faf35bebaa246e24249a2c3b0ca7392745 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 12 Feb 2016 21:41:35 +0000
Subject: [PATCH] Prep work for OPENDJ-1342: align APIs for DNs: isDescendantOf() => isSubordinateOrEqualTo()
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
index d380364..c066dd8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
@@ -1388,21 +1388,21 @@
{
// Check if this entry is an immediate child.
if (entryDN.size() == aBaseDN.size() + 1
- && entryDN.isDescendantOf(aBaseDN))
+ && entryDN.isSubordinateOrEqualTo(aBaseDN))
{
return true;
}
}
else if (searchScope == SearchScope.WHOLE_SUBTREE)
{
- if (entryDN.isDescendantOf(aBaseDN))
+ if (entryDN.isSubordinateOrEqualTo(aBaseDN))
{
return true;
}
}
else if (searchScope == SearchScope.SUBORDINATES
&& entryDN.size() > aBaseDN.size()
- && entryDN.isDescendantOf(aBaseDN))
+ && entryDN.isSubordinateOrEqualTo(aBaseDN))
{
return true;
}
@@ -2479,7 +2479,7 @@
private DN getMatchedDN(ReadableTransaction txn, DN targetDN) throws DirectoryException
{
DN parentDN = targetDN.getParentDNInSuffix();
- while (parentDN != null && parentDN.isDescendantOf(baseDN))
+ while (parentDN != null && parentDN.isSubordinateOrEqualTo(baseDN))
{
if (entryExists(txn, parentDN))
{
--
Gitblit v1.10.0