diff --git a/apps/backend/backend_commit.c b/apps/backend/backend_commit.c index e3e8f122..deffd9fd 100644 --- a/apps/backend/backend_commit.c +++ b/apps/backend/backend_commit.c @@ -313,15 +313,6 @@ startup_commit(clicon_handle h, /* 10. Call plugin transaction end callbacks */ plugin_transaction_end(h, td); - /* 11. Copy running back to candidate in case end functions updated running - * XXX: room for improvement: candidate and running may be equal. - * Copy only diffs? - */ - if (xmldb_copy(h, "running", "candidate") < 0){ - /* ignore errors or signal major setback ? */ - clicon_log(LOG_NOTICE, "Error in rollback, trying to continue"); - goto done; - } retval = 1; done: if (td) @@ -494,15 +485,6 @@ candidate_commit(clicon_handle h, /* 9. Call plugin transaction end callbacks */ plugin_transaction_end(h, td); - /* 8. Copy running back to candidate in case end functions updated running - * XXX: room for improvement: candidate and running may be equal. - * Copy only diffs? - */ - if (xmldb_copy(h, "running", candidate) < 0){ - /* ignore errors or signal major setback ? */ - clicon_log(LOG_NOTICE, "Error in rollback, trying to continue"); - goto done; - } retval = 1; done: /* In case of failure (or error), call plugin transaction termination callbacks */ diff --git a/lib/src/clixon_xml_map.c b/lib/src/clixon_xml_map.c index 09985887..8a79bdac 100644 --- a/lib/src/clixon_xml_map.c +++ b/lib/src/clixon_xml_map.c @@ -1652,7 +1652,7 @@ xml_default(cxobj *xt, } } } - xml_sort(xt, NULL); + // xml_sort(xt, NULL); retval = 0; done: return retval;