From adf129a1d0630b4b13a66fb3d480e8dda79601c0 Mon Sep 17 00:00:00 2001
From: dugan <dugan@localhost>
Date: Thu, 03 Sep 2009 21:37:03 +0000
Subject: [PATCH] Fix incorrect number of entries when DN processing is done in first phase. Issue 4207.
---
opends/src/server/org/opends/server/backends/jeb/importLDIF/ImportIDSet.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/importLDIF/ImportIDSet.java b/opends/src/server/org/opends/server/backends/jeb/importLDIF/ImportIDSet.java
index 0d7cac3..6814363 100644
--- a/opends/src/server/org/opends/server/backends/jeb/importLDIF/ImportIDSet.java
+++ b/opends/src/server/org/opends/server/backends/jeb/importLDIF/ImportIDSet.java
@@ -205,18 +205,16 @@
} else if(dbUndefined && (importIdSet.isDefined())) {
undefinedSize = JebFormat.entryIDUndefinedSizeFromDatabase(dBbytes) +
importIdSet.size();
- importIdSet.setUndefined();
isDefined=false;
} else if(!importIdSet.isDefined()) {
int dbSize = JebFormat.entryIDListFromDatabase(dBbytes).length;
- undefinedSize= dbSize + importIdSet.getUndefinedSize();
- isDefined=false;
+ undefinedSize = dbSize + importIdSet.getUndefinedSize();
+ isDefined = false;
incrementLimitCount = true;
} else {
array = JebFormat.entryIDListFromDatabase(dBbytes);
if(array.length + importIdSet.size() > limit) {
undefinedSize = array.length + importIdSet.size();
- importIdSet.setUndefined();
isDefined=false;
incrementLimitCount=true;
} else {
@@ -282,10 +280,12 @@
isDefined=false;
importIdSet.setUndefined();
undefinedSize = Long.MAX_VALUE;
+ count = 0;
} else if(!importIdSet.isDefined()) {
isDefined=false;
incrementLimitCount=true;
undefinedSize = Long.MAX_VALUE;
+ count = 0;
} else {
array = JebFormat.entryIDListFromDatabase(bytes);
if(array.length + importIdSet.size() > limit) {
--
Gitblit v1.10.0