From 8df85caca96d8bb79fcc2cf01cf6ef0a3f06930d Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 13 Mar 2015 23:44:25 +0000
Subject: [PATCH] Minor code cleanup: remove DatabaseContainer.entryContainer field
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java
index a56afe1..20e33c4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java
@@ -112,8 +112,7 @@
DN2URI(TreeName treeName, Storage storage, EntryContainer entryContainer)
throws StorageRuntimeException
{
- super(treeName, storage, entryContainer);
-
+ super(treeName, storage);
prefixRDNComponents = entryContainer.getBaseDN().size();
}
@@ -533,8 +532,7 @@
try
{
// Go up through the DIT hierarchy until we find a referral.
- for (DN dn = entryContainer.getParentWithinBase(targetDN); dn != null;
- dn = entryContainer.getParentWithinBase(dn))
+ for (DN dn = getParentWithinBase(targetDN); dn != null; dn = getParentWithinBase(dn))
{
// Look for a record whose key matches the current DN.
if (cursor.positionToKey(toKey(dn)))
@@ -557,6 +555,11 @@
}
}
+ private DN getParentWithinBase(DN targetDN)
+ {
+ return targetDN.size() == prefixRDNComponents ? null: targetDN.parent();
+ }
+
/**
* Return search result references for a search operation using the referral
* database to find all referral entries within scope of the search.
--
Gitblit v1.10.0