From e1b3d6e88e9af227b69fed69de86a248fe6bce46 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 12 Feb 2016 21:42:31 +0000
Subject: [PATCH] DN.getParentDNInSuffix() => DirectoryServer.getParentDNInSuffix(DN)
---
opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
index 657a214..745cd21 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
@@ -410,7 +410,7 @@
// If so, then it must point to a backup directory. Otherwise, it must be
// two levels below the backup base entry and must point to a specific
// backup.
- DN parentDN = entryDN.getParentDNInSuffix();
+ DN parentDN = DirectoryServer.getParentDNInSuffix(entryDN);
if (parentDN == null)
{
return -1;
@@ -437,7 +437,7 @@
}
return count;
}
- else if (backupBaseDN.equals(parentDN.getParentDNInSuffix()))
+ else if (backupBaseDN.equals(DirectoryServer.getParentDNInSuffix(parentDN)))
{
return 0;
}
@@ -471,7 +471,7 @@
// If so, then it must point to a backup directory. Otherwise, it must be
// two levels below the backup base entry and must point to a specific
// backup.
- DN parentDN = entryDN.getParentDNInSuffix();
+ DN parentDN = DirectoryServer.getParentDNInSuffix(entryDN);
if (parentDN == null)
{
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
@@ -481,7 +481,7 @@
{
return getBackupDirectoryEntry(entryDN);
}
- else if (backupBaseDN.equals(parentDN.getParentDNInSuffix()))
+ else if (backupBaseDN.equals(DirectoryServer.getParentDNInSuffix(parentDN)))
{
return getBackupEntry(entryDN);
}
@@ -595,7 +595,7 @@
String backupID = idValue.toString();
// Next, get the backup directory from the parent DN.
- DN parentDN = entryDN.getParentDNInSuffix();
+ DN parentDN = DirectoryServer.getParentDNInSuffix(entryDN);
if (parentDN == null) {
throw newConstraintViolation(ERR_BACKUP_NO_BACKUP_PARENT_DN.get(entryDN));
}
@@ -823,7 +823,7 @@
}
}
}
- else if (backupBaseDN.equals(parentDN = baseDN.getParentDNInSuffix()))
+ else if (backupBaseDN.equals(parentDN = DirectoryServer.getParentDNInSuffix(baseDN)))
{
Entry backupDirEntry = getBackupDirectoryEntry(baseDN);
@@ -845,7 +845,7 @@
else
{
if (parentDN == null
- || !backupBaseDN.equals(parentDN.getParentDNInSuffix()))
+ || !backupBaseDN.equals(DirectoryServer.getParentDNInSuffix(parentDN)))
{
LocalizableMessage message = ERR_BACKUP_NO_SUCH_ENTRY.get(backupBaseDN);
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
--
Gitblit v1.10.0