From b5acb25ee2ad9bf8b166b9de1a34e6aab6ea23b7 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Fri, 01 Sep 2006 12:04:47 +0000
Subject: [PATCH] issue 604 : solve the naming conflict that might happen when several masters are used there are 3 main parts in this commit : - attach the replication context in an OperationContext - if operation replay fails then fix the problem - in the pre-op checks for conflict and cause failure if necessary most of the time there should be no conflict and the operation should be processed normally
---
opends/src/server/org/opends/server/synchronization/ModifyFakeOperation.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/synchronization/ModifyFakeOperation.java b/opends/src/server/org/opends/server/synchronization/ModifyFakeOperation.java
index a302594..24338df 100644
--- a/opends/src/server/org/opends/server/synchronization/ModifyFakeOperation.java
+++ b/opends/src/server/org/opends/server/synchronization/ModifyFakeOperation.java
@@ -44,17 +44,20 @@
{
private ArrayList<Modification> mods = new ArrayList<Modification>();
private DN dn;
+ private String entryuuid;
/**
* Creates a new ModifyFakeOperation with the provided information.
*
* @param dn The dn on which the Operation was applied.
* @param changenumber The ChangeNumber of the operation.
+ * @param entryuuid The unique ID of the entry on which the Operation applies.
*/
- public ModifyFakeOperation(DN dn, ChangeNumber changenumber)
+ public ModifyFakeOperation(DN dn, ChangeNumber changenumber, String entryuuid)
{
super(changenumber);
this.dn = dn;
+ this.entryuuid = entryuuid;
}
/**
@@ -75,6 +78,6 @@
@Override
public SynchronizationMessage generateMessage()
{
- return new ModifyMsg(super.getChangeNumber(), dn, mods);
+ return new ModifyMsg(super.getChangeNumber(), dn, mods, entryuuid);
}
}
--
Gitblit v1.10.0