X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FNoOpDOMStoreThreePhaseCommitCohort.java;h=9b477320e56df40136c6f6c47cee76c8700bea5c;hp=1f5f5bcf79351764eb7776634a950f59077f63dc;hb=1d5ca4009be6c61d7b61989799037ad8f1ab7a75;hpb=228af4aa1ef1a802fd24e7e010f3bba959ee03dd diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/NoOpDOMStoreThreePhaseCommitCohort.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/NoOpDOMStoreThreePhaseCommitCohort.java index 1f5f5bcf79..9b477320e5 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/NoOpDOMStoreThreePhaseCommitCohort.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/NoOpDOMStoreThreePhaseCommitCohort.java @@ -10,6 +10,8 @@ package org.opendaylight.controller.cluster.datastore; import com.google.common.util.concurrent.ListenableFuture; import java.util.Collections; import java.util.List; +import org.opendaylight.mdsal.common.api.CommitInfo; +import org.opendaylight.yangtools.yang.common.Empty; import scala.concurrent.Future; /** @@ -29,18 +31,18 @@ final class NoOpDOMStoreThreePhaseCommitCohort extends AbstractThreePhaseCommitC } @Override - public ListenableFuture preCommit() { - return IMMEDIATE_VOID_SUCCESS; + public ListenableFuture preCommit() { + return IMMEDIATE_EMPTY_SUCCESS; } @Override - public ListenableFuture abort() { - return IMMEDIATE_VOID_SUCCESS; + public ListenableFuture abort() { + return IMMEDIATE_EMPTY_SUCCESS; } @Override - public ListenableFuture commit() { - return IMMEDIATE_VOID_SUCCESS; + public ListenableFuture commit() { + return CommitInfo.emptyFluentFuture(); } @Override