From e4b6be3ae7c5f47e1e900a952d54009cf6b6054a Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 12 Feb 2016 21:44:14 +0000
Subject: [PATCH] DN.matchesBaseAndScope(DN, SearchScope) => DN.isInScopeOf(DN, SearchScope)

---
 opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
index 8737f0b..d39797a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -1164,7 +1164,7 @@
 
         final Entry valueEntry;
         if (currentConfiguration.getCheckReferencesScopeCriteria() == CheckReferencesScopeCriteria.NAMING_CONTEXT
-            && valueEntryDN.matchesBaseAndScope(entryBaseDN, SearchScope.SUBORDINATES))
+            && valueEntryDN.isInScopeOf(entryBaseDN, SearchScope.SUBORDINATES))
         {
           return PluginResult.PreOperation.stopProcessing(ResultCode.CONSTRAINT_VIOLATION,
               ERR_PLUGIN_REFERENT_NAMINGCONTEXT_MISMATCH.get(valueEntryDN, attr.getName(), entryDN));
@@ -1218,7 +1218,7 @@
 
     for (DN baseDN : baseDNs)
     {
-      if (dn.matchesBaseAndScope(baseDN, SearchScope.SUBORDINATES))
+      if (dn.isInScopeOf(baseDN, SearchScope.SUBORDINATES))
       {
         namingContext = baseDN;
         break;

--
Gitblit v1.10.0