From 70db0ff15b38ebb0884815a0e26ab6abdb850855 Mon Sep 17 00:00:00 2001
From: dugan <dugan@localhost>
Date: Fri, 25 Apr 2008 19:38:28 +0000
Subject: [PATCH] Fix daily build failures related to fix for issue 3135.
---
opends/src/server/org/opends/server/backends/jeb/importLDIF/WorkThread.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/importLDIF/WorkThread.java b/opends/src/server/org/opends/server/backends/jeb/importLDIF/WorkThread.java
index 630334a..cc2cdfc 100644
--- a/opends/src/server/org/opends/server/backends/jeb/importLDIF/WorkThread.java
+++ b/opends/src/server/org/opends/server/backends/jeb/importLDIF/WorkThread.java
@@ -459,9 +459,14 @@
}
} else {
if(!processParent(element, txn))
- return null;
- ArrayList IDs = (ArrayList)entry.getAttachment();
- entryID = (EntryID)IDs.get(0);
+ return null;
+ if (ldifImportConfig.appendToExistingData() &&
+ ldifImportConfig.replaceExistingEntries()) {
+ entryID = rootContainer.getNextEntryID();
+ } else {
+ ArrayList IDs = (ArrayList)entry.getAttachment();
+ entryID = (EntryID)IDs.get(0);
+ }
dn2id.insert(txn, entryDN, entryID);
}
context.removePending(entryDN);
--
Gitblit v1.10.0