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/crypto/CryptoManagerSync.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java
index 3d7a6be..9eeb73b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java
@@ -435,11 +435,11 @@
final Entry entry = op.getEntryToAdd();
final DN entryDN = op.getEntryDN();
- if (entryDN.isDescendantOf(instanceKeysDN))
+ if (entryDN.isSubordinateOrEqualTo(instanceKeysDN))
{
handleInstanceKeyAddOperation(entry);
}
- else if (entryDN.isDescendantOf(secretKeysDN))
+ else if (entryDN.isSubordinateOrEqualTo(secretKeysDN))
{
try
{
@@ -480,7 +480,7 @@
public PostResponse doPostResponse(PostResponseDeleteOperation op)
{
if (op.getResultCode() != ResultCode.SUCCESS
- || !op.getEntryDN().isDescendantOf(instanceKeysDN))
+ || !op.getEntryDN().isSubordinateOrEqualTo(instanceKeysDN))
{
return PostResponse.continueOperationProcessing();
}
@@ -508,11 +508,11 @@
final Entry newEntry = op.getModifiedEntry();
final DN entryDN = op.getEntryDN();
- if (entryDN.isDescendantOf(instanceKeysDN))
+ if (entryDN.isSubordinateOrEqualTo(instanceKeysDN))
{
handleInstanceKeyModifyOperation(newEntry);
}
- else if (entryDN.isDescendantOf(secretKeysDN))
+ else if (entryDN.isSubordinateOrEqualTo(secretKeysDN))
{
try
{
--
Gitblit v1.10.0