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/guitools/controlpanel/task/DeleteEntryTask.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
index 5bb97d5..c36d424 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2015 ForgeRock AS
+ *      Portions Copyright 2013-2016 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.task;
@@ -118,7 +118,7 @@
       {
         for (DN dn : entries)
         {
-          if (dn.isDescendantOf(baseDN.getDn()))
+          if (dn.isSubordinateOrEqualTo(baseDN.getDn()))
           {
             backendSet.add(backend.getBackendID());
             break;
@@ -208,7 +208,7 @@
           boolean isDnDeleted = false;
           for (DN deletedDn : alreadyDeleted)
           {
-            if (dn.isDescendantOf(deletedDn))
+            if (dn.isSubordinateOrEqualTo(deletedDn))
             {
               isDnDeleted = true;
               break;

--
Gitblit v1.10.0