Add support of new a NetconfDataTreeService in clustered netconf

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

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDataTreeServiceImpl.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDataTreeServiceImpl.java
index df0c65050c15de59921d41d33c0c51d7cb52e0f0..4bd3dc8bb51b16665e35f65a4e2cb8c61b1e34b7 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDataTreeServiceImpl.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDataTreeServiceImpl.java
@@ -283,8 +283,8 @@ public class NetconfDataTreeServiceImpl implements NetconfDataTreeService {
             final List<ListenableFuture<? extends DOMRpcResult>> resultsFutures) {
         resultsFutures.add(netconfOps.commit(new NetconfRpcFutureCallback("Commit", id)));
 
-        final ListenableFuture<RpcResult<Void>> txResult = resultsToTxStatus(id, resultsFutures);
-        Futures.addCallback(txResult, new FutureCallback<>() {
+        final ListenableFuture<RpcResult<Void>> result = resultsToStatus(id, resultsFutures);
+        Futures.addCallback(result, new FutureCallback<>() {
             @Override
             public void onSuccess(final RpcResult<Void> result) {
                 unlock();
@@ -296,11 +296,10 @@ public class NetconfDataTreeServiceImpl implements NetconfDataTreeService {
                 unlock();
             }
         }, MoreExecutors.directExecutor());
-
-        return txResult;
+        return result;
     }
 
-    private static ListenableFuture<RpcResult<Void>> resultsToTxStatus(
+    private static ListenableFuture<RpcResult<Void>> resultsToStatus(
             final RemoteDeviceId id, List<ListenableFuture<? extends DOMRpcResult>> resultsFutures) {
         final SettableFuture<RpcResult<Void>> transformed = SettableFuture.create();