X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-manager-facade-xml%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Ffacade%2Fxml%2Ftransactions%2FTransactionProvider.java;h=e255757dc188cbaa87bffe0971965b6ee2a1176b;hp=a40bac9b054a9e34490b181b838be4a1ef71643d;hb=2d60632f7cf63712e8357a3cf3fc40d83366e5e6;hpb=1c717bbf117d3486196a0fdd73ac650721f9c557;ds=sidebyside diff --git a/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/transactions/TransactionProvider.java b/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/transactions/TransactionProvider.java index a40bac9b05..e255757dc1 100644 --- a/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/transactions/TransactionProvider.java +++ b/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/transactions/TransactionProvider.java @@ -133,7 +133,7 @@ public class TransactionProvider implements AutoCloseable { /** * Commit and notification send must be atomic. */ - public synchronized CommitStatus commitTransaction(final ConfigRegistryClient configRegistryClient) + public synchronized CommitStatus commitTransaction(final ConfigRegistryClient client) throws ValidationException, ConflictingVersionException { if (!getTransaction().isPresent()) { // making empty commit without prior opened transaction, just return commit @@ -144,7 +144,7 @@ public class TransactionProvider implements AutoCloseable { final Optional maybeTaON = getTransaction(); ObjectName taON = maybeTaON.get(); try { - CommitStatus status = configRegistryClient.commitConfig(taON); + CommitStatus status = client.commitConfig(taON); // clean up allOpenedTransactions.remove(candidateTx); candidateTx = null;