From 984ba7b145520f02414eedf36b88946172ef4dd3 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 07 Oct 2013 12:53:45 +0000
Subject: [PATCH] OPENDJ-1116 Introduce abstraction for the changelog DB
---
opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index 94b664f..4265759 100644
--- a/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -137,7 +137,7 @@
for (FakeOperation op : updates)
{
CSN csn = op.getCSN();
- if (csn.newer(startCSN) && csn.older(endCSN))
+ if (csn.isNewerThan(startCSN) && csn.isOlderThan(endCSN))
{
synchronized (replayOperations)
{
@@ -4406,7 +4406,8 @@
if (replServerMaxCSN != null && replServerMaxCSN.getSeqnum() != 0)
{
CSN ourMaxCSN = state.getMaxCSN(getServerId());
- if (ourMaxCSN != null && !ourMaxCSN.olderOrEqual(replServerMaxCSN))
+ if (ourMaxCSN != null
+ && !ourMaxCSN.isOlderThanOrEqualTo(replServerMaxCSN))
{
pendingChanges.setRecovering(true);
broker.setRecoveryRequired(true);
@@ -4442,7 +4443,7 @@
Iterator<CSN> it = replayOperations.keySet().iterator();
while (it.hasNext())
{
- if (it.next().newer(startCSN))
+ if (it.next().isNewerThan(startCSN))
{
break;
}
@@ -4478,7 +4479,7 @@
while (itOp.hasNext())
{
FakeOperation fakeOp = itOp.next();
- if (fakeOp.getCSN().newer(endCSN) // sanity check
+ if (fakeOp.getCSN().isNewerThan(endCSN) // sanity check
|| !state.cover(fakeOp.getCSN()))
{
break;
--
Gitblit v1.10.0