From 251f9586274ce5f121b0bb596fbb21e1ecd39442 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 09 Sep 2016 12:52:10 +0000
Subject: [PATCH] OPENDJ-3281 Modify operations may not be replayed if case is mixed on attribute values
---
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistorical.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistorical.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistorical.java
index 60276aa..7b83f30 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistorical.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistorical.java
@@ -20,8 +20,8 @@
import java.util.Set;
import org.forgerock.opendj.ldap.ByteString;
-import org.opends.server.replication.common.CSN;
import org.forgerock.opendj.ldap.schema.AttributeType;
+import org.opends.server.replication.common.CSN;
import org.opends.server.types.Entry;
import org.opends.server.types.Modification;
@@ -59,12 +59,12 @@
/**
* Create a new object from a provided attribute type. Historical is empty.
*
- * @param type the provided attribute type.
+ * @param attrType the provided attribute type.
* @return a new AttributeInfo object.
*/
- public static AttrHistorical createAttributeHistorical(AttributeType type)
+ public static AttrHistorical createAttributeHistorical(AttributeType attrType)
{
- return type.isSingleValue() ? new AttrHistoricalSingle() : new AttrHistoricalMultiple();
+ return attrType.isSingleValue() ? new AttrHistoricalSingle(attrType) : new AttrHistoricalMultiple();
}
/**
@@ -85,8 +85,9 @@
* Assign the provided information to this object.
*
* @param histKey the key to assign.
+ * @param attrType the associated attribute type.
* @param value the associated value or null if there is no value;
* @param csn the associated CSN.
*/
- public abstract void assign(HistAttrModificationKey histKey, ByteString value, CSN csn);
+ public abstract void assign(HistAttrModificationKey histKey, AttributeType attrType, ByteString value, CSN csn);
}
--
Gitblit v1.10.0