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%2Ftx%2FWriteCandidateRunningTx.java;h=40a43c1cbe6eb61e1b2873e87cb3dc7117520566;hb=827f758622c4cce82653f3d00507b8a88e7e457a;hp=a693e8c59c3db5a07fc0538a675e72f550582b86;hpb=ed9a039195f45c611ab5bd2672ed6ae1d50fa7b6;p=netconf.git diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateRunningTx.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateRunningTx.java index a693e8c59c..40a43c1cbe 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateRunningTx.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateRunningTx.java @@ -23,6 +23,7 @@ import org.slf4j.LoggerFactory; *
  • Running datastore is locked as the first thing and this lock has to succeed
  • * */ +//TODO replace custom RPCs future callbacks with NetconfRpcFutureCallback public class WriteCandidateRunningTx extends WriteCandidateTx { private static final Logger LOG = LoggerFactory.getLogger(WriteCandidateRunningTx.class); @@ -59,10 +60,9 @@ public class WriteCandidateRunningTx extends WriteCandidateTx { @Override public void onFailure(Throwable t) { LOG.warn("{}: Failed to lock running. Failed to initialize transaction", id, t); - throw new RuntimeException(id + ": Failed to lock running. Failed to initialize transaction", t); } }; - netOps.lockRunning(lockRunningCallback); + resultsFutures.add(netOps.lockRunning(lockRunningCallback)); } /**