commit bcf4d7d0a410a62090ad23c05b6c0dd8ad38f3bb
author Michal Vasko <mvasko@cesnet.cz> Wed Nov 18 18:16:49 2020 +0100
committer Radek Krejci <rkrejci@cesnet.cz> Thu Nov 19 08:55:34 2020 +0100
tree 0c8aea746b0f32f1834b24d288ef55b23b97f857
parent 3af81bc669929ce014fc6dc9505d49f2bf4df55a

data tree BUGFIX create default nodes in existing cases

src/tree_data.c

diff --git a/src/tree_data.c b/src/tree_data.c
index f3c3b87..19633a7 100644
--- a/src/tree_data.c
+++ b/src/tree_data.c
@@ -1445,10 +1445,16 @@
 
         switch (iter->nodetype) {
         case LYS_CHOICE:
-            if (((struct lysc_node_choice *)iter)->dflt && !lys_getnext_data(NULL, *first, NULL, iter, NULL)) {
+            node = lys_getnext_data(NULL, *first, NULL, iter, NULL);
+            if (!node && ((struct lysc_node_choice *)iter)->dflt) {
                 /* create default case data */
                 LY_CHECK_RET(lyd_new_implicit_r(parent, first, (struct lysc_node *)((struct lysc_node_choice *)iter)->dflt,
                         NULL, node_types, node_when, impl_opts, diff));
+            } else if (node) {
+                /* create any default data in the existing case */
+                assert(node->schema->parent->nodetype == LYS_CASE);
+                LY_CHECK_RET(lyd_new_implicit_r(parent, first, node->schema->parent, NULL, node_types, node_when,
+                        impl_opts, diff));
             }
             break;
         case LYS_CONTAINER: