Fix permanent lock on the running configuration via RESTconf

[netconf.git] / netconf / sal-netconf-connector / src / main / java / org / opendaylight / netconf / sal / connect / netconf / sal / AbstractNetconfDataTreeService.java

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/AbstractNetconfDataTreeService.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/AbstractNetconfDataTreeService.java
index de820bacdc6b6662c77442dbe38002654118a940..771f29e6ce5d510961f193cd5d35b18e29de07d7 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/AbstractNetconfDataTreeService.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/AbstractNetconfDataTreeService.java
@@ -91,13 +91,12 @@ public abstract class AbstractNetconfDataTreeService implements NetconfDataTreeS
             Futures.addCallback(result, new FutureCallback<>() {
                 @Override
                 public void onSuccess(final RpcResult<Void> result) {
-                    unlock();
+                    // do nothing, as callback is only used to catch failures
                 }
 
                 @Override
                 public void onFailure(final Throwable throwable) {
                     discardChanges();
-                    unlock();
                 }
             }, MoreExecutors.directExecutor());
             return result;
@@ -329,11 +328,13 @@ public abstract class AbstractNetconfDataTreeService implements NetconfDataTreeS
                             errors.toArray(new RpcError[errors.size()])));
                     return;
                 }
+                unlock();
                 resultFuture.set(CommitInfo.empty());
             }
 
             @Override
             public void onFailure(final Throwable failure) {
+                unlock();
                 resultFuture.setException(new TransactionCommitFailedException(
                         String.format("Commit of transaction %s failed", this), failure));
             }