From 024f10957a7ba6051432bb827dbe8bc2f6034ff2 Mon Sep 17 00:00:00 2001
From: dugan <dugan@localhost>
Date: Thu, 22 Oct 2009 15:28:52 +0000
Subject: [PATCH] Fix for 4291(2) - null pointer exception using --skipDNValidation and -a
---
opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java b/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
index 35d2cec..a22e8ea 100644
--- a/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
+++ b/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
@@ -1789,18 +1789,18 @@
long v1 = JebFormat.entryIDFromDatabase(v);
DNValue.setData(v);
DN dn = DN.decode(ByteString.wrap(DNKey.getData()));
+ entryID = new EntryID(v1);
//Bypass the cache for append data, lookup the parent in DN2ID and
//return.
if(importConfiguration != null &&
importConfiguration.appendToExistingData())
{
- DN newParentDN = entryContainer.getParentWithinBase(dn);
+ parentDN = entryContainer.getParentWithinBase(dn);
parentID =
- entryContainer.getDN2ID().get(null, newParentDN, LockMode.DEFAULT);
+ entryContainer.getDN2ID().get(null, parentDN, LockMode.DEFAULT);
}
else
{
- entryID = new EntryID(v1);
if(parentIDMap.isEmpty())
{
parentIDMap.put(dn, entryID);
--
Gitblit v1.10.0