AttrHistoricalMultiple.java: In replayOperation(), enabled more fine-graine...

Jean-Noël Rouvignac

31.58.2015 4da84559ac3e4b12bb56373203c1426e82b3c7ef

AttrHistoricalMultiple.java:
In replayOperation(), enabled more fine-grained conflict reporting for replay

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