From 0f06b17545d4c89b56071cf084363992d975af43 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 22 Sep 2015 11:37:06 +0000
Subject: [PATCH] AttrHistoricalMultiple.java: In replayOperation(), enabled more fine-grained conflict reporting for replay
---
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalMultiple.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalMultiple.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalMultiple.java
index 132940d..5c3a842 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalMultiple.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalMultiple.java
@@ -276,6 +276,7 @@
* -> this generates the list of values that needs to be added
* concatenate the 2 generated lists into a replace
*/
+ boolean conflict = false;
Attribute addedValues = m.getAttribute();
m.setAttribute(new AttributeBuilder(addedValues, true).toAttribute());
@@ -286,12 +287,13 @@
if (!processAddConflict(csn, m))
{
modsIterator.remove();
+ conflict = true;
}
AttributeBuilder builder = new AttributeBuilder(keptValues);
builder.addAll(m.getAttribute());
m.setAttribute(builder.toAttribute());
- return false;
+ return conflict;
case INCREMENT:
// TODO : FILL ME
--
Gitblit v1.10.0