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/replication/plugin/RemotePendingChanges.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/RemotePendingChanges.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/RemotePendingChanges.java
index 27da159..70e282f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/RemotePendingChanges.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/RemotePendingChanges.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.replication.plugin;
@@ -448,7 +448,7 @@
* Check if the operation to be run is a deleteOperation on a
* children of the current DeleteOperation.
*/
- if (pendingMsg.getDN().isDescendantOf(targetDN))
+ if (pendingMsg.getDN().isSubordinateOrEqualTo(targetDN))
{
hasDependencies = true;
addDependency(change, pendingChange);
@@ -473,7 +473,7 @@
* Check if the operation to be run is an ModifyDNOperation
* on a children of the current DeleteOperation
*/
- if (pendingMsg.getDN().isDescendantOf(targetDN)
+ if (pendingMsg.getDN().isSubordinateOrEqualTo(targetDN)
|| pendingModDn.newDNIsParent(targetDN))
{
hasDependencies = true;
--
Gitblit v1.10.0