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/AttrHistoricalSingle.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/plugin/AttrHistoricalSingle.java b/opends/src/server/org/opends/server/replication/plugin/AttrHistoricalSingle.java
index 1ec4e08..20f2c1b 100644
--- a/opends/src/server/org/opends/server/replication/plugin/AttrHistoricalSingle.java
+++ b/opends/src/server/org/opends/server/replication/plugin/AttrHistoricalSingle.java
@@ -153,11 +153,11 @@
switch (mod.getModificationType())
{
case DELETE:
- if (csn.newer(addTime))
+ if (csn.isNewerThan(addTime))
{
if (newValue == null || newValue.equals(value) || value == null)
{
- if (csn.newer(deleteTime))
+ if (csn.isNewerThan(deleteTime))
{
deleteTime = csn;
}
@@ -191,7 +191,7 @@
if ((lastMod == HistAttrModificationKey.ADD)
|| (lastMod == HistAttrModificationKey.REPL))
{
- if (csn.newer(deleteTime))
+ if (csn.isNewerThan(deleteTime))
{
deleteTime = csn;
}
@@ -213,7 +213,7 @@
break;
case ADD:
- if (csn.newerOrEquals(deleteTime) && csn.older(addTime))
+ if (csn.isNewerThanOrEqualTo(deleteTime) && csn.isOlderThan(addTime))
{
conflict = true;
mod.setModificationType(ModificationType.REPLACE);
@@ -223,8 +223,8 @@
}
else
{
- if (csn.newerOrEquals(deleteTime)
- && ((addTime == null ) || addTime.older(deleteTime)))
+ if (csn.isNewerThanOrEqualTo(deleteTime)
+ && ((addTime == null ) || addTime.isOlderThan(deleteTime)))
{
// no conflict : don't do anything beside setting the addTime
addTime = csn;
@@ -252,7 +252,7 @@
break;
case REPLACE:
- if (csn.older(deleteTime))
+ if (csn.isOlderThan(deleteTime))
{
conflict = true;
modsIterator.remove();
--
Gitblit v1.10.0