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/MonitorBackend.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
index 21f4cf3..a1ed6d0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
@@ -424,7 +424,7 @@
if (dit.containsKey(entryDN))
{
final DN nextDN = dit.higherKey(entryDN);
- return ConditionResult.valueOf(nextDN != null && nextDN.isDescendantOf(entryDN));
+ return ConditionResult.valueOf(nextDN != null && nextDN.isSubordinateOrEqualTo(entryDN));
}
return ConditionResult.UNDEFINED;
}
@@ -505,7 +505,7 @@
final int childDNSize = entryDN.size() + 1;
for (final DN dn : dit.tailMap(entryDN, false).navigableKeySet())
{
- if (!dn.isDescendantOf(entryDN))
+ if (!dn.isSubordinateOrEqualTo(entryDN))
{
break;
}
@@ -596,7 +596,7 @@
searchOperation.returnEntry(entry, null);
}
}
- else if (scope == SearchScope.BASE_OBJECT || !dn.isDescendantOf(baseDN))
+ else if (scope == SearchScope.BASE_OBJECT || !dn.isSubordinateOrEqualTo(baseDN))
{
// No more entries will be in scope.
break;
--
Gitblit v1.10.0