From 6727fbc1a159686d355716af0f6d6815bf4054f0 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Tue, 29 May 2007 08:54:18 +0000
Subject: [PATCH]
---
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/Historical.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/Historical.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/Historical.java
index 40a27dc..03d50b5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/Historical.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/Historical.java
@@ -129,10 +129,12 @@
*
* @param modifyOperation the operation to be processed
* @param modifiedEntry the entry that is being modified (before modification)
+ * @return true if the replayed operation was in conflict
*/
- public void replayOperation(ModifyOperation modifyOperation,
+ public boolean replayOperation(ModifyOperation modifyOperation,
Entry modifiedEntry)
{
+ boolean bConflict = false;
List<Modification> mods = modifyOperation.getModifications();
ChangeNumber changeNumber =
OperationContext.getChangeNumber(modifyOperation);
@@ -212,6 +214,7 @@
// TODO : FILL ME
break;
}
+ bConflict = true;
}
else
{
@@ -226,6 +229,7 @@
{
moreRecentChangenumber = changeNumber;
}
+ return bConflict;
}
/**
--
Gitblit v1.10.0