Always clean up modules-state

[netconf.git] / apps / yanglib-mdsal-writer / src / main / java / org / opendaylight / netconf / yanglib / writer / YangLibraryWriter.java

diff --git a/apps/yanglib-mdsal-writer/src/main/java/org/opendaylight/netconf/yanglib/writer/YangLibraryWriter.java b/apps/yanglib-mdsal-writer/src/main/java/org/opendaylight/netconf/yanglib/writer/YangLibraryWriter.java
index be6d0cf599168dd8d2bfb9436667a9d6f38cc522..beb5a645bd5e2e2029f2d95c973dca7c3a6e1988 100644 (file)
--- a/apps/yanglib-mdsal-writer/src/main/java/org/opendaylight/netconf/yanglib/writer/YangLibraryWriter.java
+++ b/apps/yanglib-mdsal-writer/src/main/java/org/opendaylight/netconf/yanglib/writer/YangLibraryWriter.java
@@ -73,9 +73,7 @@ final class YangLibraryWriter implements FutureCallback<Empty> {
             future = chain.future();
             final var tx = chain.newWriteOnlyTransaction();
             tx.delete(LogicalDatastoreType.OPERATIONAL, YANG_LIBRARY_INSTANCE_IDENTIFIER);
-            if (writeLegacy) {
-                tx.delete(LogicalDatastoreType.OPERATIONAL, MODULES_STATE_INSTANCE_IDENTIFIER);
-            }
+            tx.delete(LogicalDatastoreType.OPERATIONAL, MODULES_STATE_INSTANCE_IDENTIFIER);
 
             tx.commit().addCallback(new FutureCallback<CommitInfo>() {
                 @Override
@@ -129,6 +127,8 @@ final class YangLibraryWriter implements FutureCallback<Empty> {
         if (writeLegacy) {
             tx.put(LogicalDatastoreType.OPERATIONAL, MODULES_STATE_INSTANCE_IDENTIFIER,
                 YangLibraryContentBuilderUtil.buildModuleState(context, nextId, urlProvider));
+        } else {
+            tx.delete(LogicalDatastoreType.OPERATIONAL, MODULES_STATE_INSTANCE_IDENTIFIER);
         }
 
         tx.commit().addCallback(new FutureCallback<CommitInfo>() {