BUG-4295: fix merge callsite 77/33477/4
authorRobert Varga <rovarga@cisco.com>
Mon, 25 Jan 2016 09:58:55 +0000 (10:58 +0100)
committerTony Tkacik <ttkacik@cisco.com>
Mon, 25 Jan 2016 15:04:01 +0000 (15:04 +0000)
commitdfe3c8193b6fd06090de7221e51e5857b75517b6
tree8cf8002d97e4a0477fd1769e8ca61b902295563b
parentbed02b73ece35ca60ab377ae55c97ff9f6b6d44f
BUG-4295: fix merge callsite

This is a fixup of the previous patch. The problem was expanding a merge
into a new node, which used a direct value propagation with a merge.
That is not correct, as the merge should be pushed via
ModificationApplyOperation, which in case of unkeyed lists will turn it
into a write.

Change-Id: I93c8be80e4467b5d3a1e20f26f5576bd701b1375
Signed-off-by: Robert Varga <rovarga@cisco.com>
yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractNodeContainerModificationStrategy.java
yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeModification.java
yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeModificationCursor.java
yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModifiedNode.java
yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnkeyedListModificationStrategy.java