X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fsal-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fsal%2Fconnect%2Fnetconf%2Fsal%2FNetconfDataTreeServiceImpl.java;h=4bd3dc8bb51b16665e35f65a4e2cb8c61b1e34b7;hb=bc8f0f5ec11559d07892632612630697d8235009;hp=df0c65050c15de59921d41d33c0c51d7cb52e0f0;hpb=88538d2c1ed0b100b0cbaaa4e8e07975e1b0a54e;p=netconf.git 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 df0c65050c..4bd3dc8bb5 100644 --- 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> resultsFutures) { resultsFutures.add(netconfOps.commit(new NetconfRpcFutureCallback("Commit", id))); - final ListenableFuture> txResult = resultsToTxStatus(id, resultsFutures); - Futures.addCallback(txResult, new FutureCallback<>() { + final ListenableFuture> result = resultsToStatus(id, resultsFutures); + Futures.addCallback(result, new FutureCallback<>() { @Override public void onSuccess(final RpcResult result) { unlock(); @@ -296,11 +296,10 @@ public class NetconfDataTreeServiceImpl implements NetconfDataTreeService { unlock(); } }, MoreExecutors.directExecutor()); - - return txResult; + return result; } - private static ListenableFuture> resultsToTxStatus( + private static ListenableFuture> resultsToStatus( final RemoteDeviceId id, List> resultsFutures) { final SettableFuture> transformed = SettableFuture.create();