single valued attribute conflict resolution : issue 609

gbellato

04.36.2007 86b33497f6d01df4b1185341d9c468d05a5970ca

 opendj-sdk/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
    {