From 0df1c1a65807ff91a4e05ed757002bb71d74a911 Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Thu, 05 Oct 2006 15:55:02 +0000
Subject: [PATCH] Fix for issue 749. Reviewed by dugan.
---
opends/src/server/org/opends/server/backends/jeb/ImportJob.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/ImportJob.java b/opends/src/server/org/opends/server/backends/jeb/ImportJob.java
index 93143fc..5508dcd 100644
--- a/opends/src/server/org/opends/server/backends/jeb/ImportJob.java
+++ b/opends/src/server/org/opends/server/backends/jeb/ImportJob.java
@@ -214,7 +214,7 @@
rootContainer.openEntryContainers(config.getBaseDNs());
- // Create the import contextes for each base DN.
+ // Create the import contexts for each base DN.
EntryID highestID = null;
DN baseDN;
@@ -672,11 +672,8 @@
{
// Make sure the parent entry exists, unless this entry is a base DN.
EntryID parentID = null;
- DN parentDN = null;
- if (!entryDN.equals(importContext.getBaseDN()))
- {
- parentDN = entryDN.getParent();
- }
+ DN parentDN = importContext.getEntryContainer().
+ getParentWithinBase(entryDN);
if (parentDN != null)
{
parentID = dn2id.get(txn, parentDN);
@@ -713,10 +710,9 @@
if (parentID != null)
{
IDs.add(parentID);
- DN baseDN = importContext.getBaseDN();
- for (DN dn = parentDN.equals(baseDN) ? null : parentDN.getParent();
- dn != null;
- dn = dn.equals(baseDN) ? null : dn.getParent())
+ EntryContainer ec = importContext.getEntryContainer();
+ for (DN dn = ec.getParentWithinBase(parentDN); dn != null;
+ dn = ec.getParentWithinBase(dn))
{
// Read the ID from dn2id.
EntryID nodeID = dn2id.get(txn, dn);
--
Gitblit v1.10.0