X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatabroker%2Factors%2Fdds%2FDirectTransactionCommitCohort.java;h=5b5ff5864a3f8a50bffa650fce2db2a04e7f4fdd;hb=HEAD;hp=9b21b98682bf71a7e807985dba4f0f5c7e586832;hpb=3859df9beca8f13f1ff2b2744ed3470a1715bec3;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/DirectTransactionCommitCohort.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/DirectTransactionCommitCohort.java index 9b21b98682..5b5ff5864a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/DirectTransactionCommitCohort.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/DirectTransactionCommitCohort.java @@ -11,6 +11,8 @@ import static java.util.Objects.requireNonNull; import com.google.common.util.concurrent.ListenableFuture; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; +import org.opendaylight.mdsal.common.api.CommitInfo; +import org.opendaylight.yangtools.yang.common.Empty; /** * An {@link AbstractTransactionCommitCohort} implementation for transactions which contain a single proxy. Since there @@ -33,19 +35,19 @@ final class DirectTransactionCommitCohort extends AbstractTransactionCommitCohor } @Override - public ListenableFuture preCommit() { - return VOID_FUTURE; + public ListenableFuture preCommit() { + return EMPTY_FUTURE; } @Override - public ListenableFuture abort() { + public ListenableFuture abort() { complete(); - return VOID_FUTURE; + return EMPTY_FUTURE; } @Override - public ListenableFuture commit() { + public ListenableFuture commit() { complete(); - return VOID_FUTURE; + return CommitInfo.emptyFluentFuture(); } }