From d9bb9ee7d029bf13dd31b9f428c8ac37bfe0bba8 Mon Sep 17 00:00:00 2001
From: dugan <dugan@localhost>
Date: Mon, 31 Aug 2009 17:14:37 +0000
Subject: [PATCH] Reconcile import count with number imported. Issue 4198.

---
 opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java |    4 +++-
 1 files changed, 3 insertions(+), 1 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 012588f..044d35d 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
@@ -80,6 +80,7 @@
           new IndexBuffer.IndexComparator();
 
   private final AtomicInteger bufferCount = new AtomicInteger(0);
+  private final AtomicLong importCount = new AtomicLong(0);
   private final File tempDir;
   private final int indexCount, threadCount;
   private final boolean skipDNValidation;
@@ -492,7 +493,7 @@
       if (importTime > 0)
         rate = 1000f * reader.getEntriesRead() / importTime;
       message = NOTE_JEB_IMPORT_FINAL_STATUS.get(reader.getEntriesRead(),
-              reader.getEntriesRead(), reader.getEntriesIgnored(), reader
+              importCount.get(), reader.getEntriesIgnored(), reader
                  .getEntriesRejected(), migratedCount, importTime / 1000, rate);
       logError(message);
     }
@@ -1080,6 +1081,7 @@
           EntryID entryID = entryInfo.getEntryID();
           Suffix suffix = entryInfo.getSuffix();
           processEntry(entry, entryID, suffix);
+          importCount.getAndIncrement();
         }
         flushIndexBuffers();
         closeCursors();

--
Gitblit v1.10.0