Code Review / yangtools.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(parent: e55154f) | patch
BUG-4295: fix merge callsite 85/33485/1
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:32:27 +0000 (15:32 +0000)
commitfce70654f7d387a8454c8441459ffff03ad0f1a2
tree2f6971bc6960d446190438376b29dbfd45c494f2tree | snapshot
parente55154f0d2e8208ce1356ddbad281df343f3a508commit | diff
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>
(cherry picked from commit dfe3c8193b6fd06090de7221e51e5857b75517b6)
yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractNodeContainerModificationStrategy.java diff | blob | history
yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeModification.java diff | blob | history
yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeModificationCursor.java diff | blob | history
yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModifiedNode.java diff | blob | history
yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnkeyedListModificationStrategy.java diff | blob | history
OpenDaylight YANG Tools