From a714dc56fbe8419a6f0e4e8ffd36384009a89557 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Fri, 11 May 2007 13:19:28 +0000
Subject: [PATCH] This code allows the replication code to replay operation in the correct order when operation have dependencies (like adding child entry after parent)

---
 opendj-sdk/opends/src/server/org/opends/server/replication/server/DbHandler.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/DbHandler.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/DbHandler.java
index 9102301..4a562c5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/DbHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/DbHandler.java
@@ -238,10 +238,13 @@
       {}
     }
 
-    if ( (recentChangeNumber != null) &&
-         (recentChangeNumber.getTimeSec() - changeNumber.getTimeSec() < 2))
+    if ( (recentChangeNumber != null) && (changeNumber != null))
     {
-      flush();
+      if (((recentChangeNumber.getTimeSec() - changeNumber.getTimeSec()) < 2) ||
+         ((recentChangeNumber.getSeqnum() - changeNumber.getSeqnum()) < 20))
+      {
+        flush();
+      }
     }
 
     return new ReplicationIterator(serverId, db, changeNumber);

--
Gitblit v1.10.0