From dcc67378350418e11e50e72996c24b61f1ea8f81 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Mon, 04 Jun 2007 07:36:45 +0000
Subject: [PATCH] single valued attribute conflict resolution : issue 609
---
opends/src/server/org/opends/server/replication/plugin/HistVal.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/plugin/HistVal.java b/opends/src/server/org/opends/server/replication/plugin/HistVal.java
index a947d44..f5ae47c 100644
--- a/opends/src/server/org/opends/server/replication/plugin/HistVal.java
+++ b/opends/src/server/org/opends/server/replication/plugin/HistVal.java
@@ -70,6 +70,9 @@
* description:00000108b3a6cbb800000001:repl:new_value
* or
* description:00000108b3a6cbb800000001:delAttr
+ * or
+ * description:00000108b3a6554100000001:add
+ * or
*
* so after split
* token[0] will contain the attribute name
@@ -104,8 +107,13 @@
stringValue = null;
if (histKey != HistKey.DELATTR)
{
- stringValue = token[3];
- attributeValue = new AttributeValue(attrType, stringValue);
+ if (token.length == 4)
+ {
+ stringValue = token[3];
+ attributeValue = new AttributeValue(attrType, stringValue);
+ }
+ else
+ attributeValue = null;
}
else
{
--
Gitblit v1.10.0