From 28d57b868fb2f43c8a1631818d78ff3ed6908308 Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Mon, 3 Feb 2014 19:20:36 +0100 Subject: [PATCH] Fixed bug when new childs were ommited during data store merge. Change-Id: I0680d1354614d7597b0079445951d4a6f33d8d5c Signed-off-by: Tony Tkacik --- .../controller/sal/dom/broker/util/YangDataOperations.xtend | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangDataOperations.xtend b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangDataOperations.xtend index a9ec2c7992..1e89281df4 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangDataOperations.xtend +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangDataOperations.xtend @@ -70,7 +70,7 @@ class YangDataOperations { if(node.keyDefinition === null || node.keyDefinition.empty) { return modified; - } + } val originalMap = (original as List).toIndexMap(node.keyDefinition); val modifiedMap = (modified as List).toIndexMap(node.keyDefinition); @@ -80,7 +80,8 @@ class YangDataOperations { if(originalEntry != null) { originalMap.remove(entry.key); mergedNodes.add(merge(node,originalEntry,entry.value,configurational)); - + } else { + mergedNodes.add(entry.value); } } mergedNodes.addAll(originalMap.values); -- 2.36.6