From 4b7bf9f0b51c9f487a92c3686825ec57d0ebf156 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Mon, 19 Mar 2007 08:05:16 +0000
Subject: [PATCH] Fix for issue 1375 : Conflict between add and replace can be incorrectly resolved The problem happens because the historical information saved in the entry is badly read in the Historical.load() method
---
opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java
index 74ddde4..7b2e078 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java
@@ -740,6 +740,9 @@
}
else
{
+ // This is a replayed operation, it is necessary to
+ // - check if the entry has been renamed
+ // - check for conflicts
String modifiedEntryUUID = ctx.getEntryUid();
String currentEntryUUID = Historical.getEntryUuid(modifiedEntry);
if ((currentEntryUUID != null) &&
--
Gitblit v1.10.0