From 71341d916552c1017e16e3333af985d4ab8c23e1 Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Thu, 18 Oct 2007 20:44:19 +0000
Subject: [PATCH] Fixed an issue where the ldif-import process will hang after a intermediate merge.

---
 opends/src/server/org/opends/server/backends/jeb/ImportJob.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 1f4aba8..c4c8216 100644
--- a/opends/src/server/org/opends/server/backends/jeb/ImportJob.java
+++ b/opends/src/server/org/opends/server/backends/jeb/ImportJob.java
@@ -633,7 +633,7 @@
         entriesProcessed++;
         if (entriesProcessed >= importPassSize)
         {
-          merge(false);
+          merge(true);
           entriesProcessed = 0;
         }
       }

--
Gitblit v1.10.0