Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump versions 9.0.4-SNAPSHOT
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
databroker
/
actors
/
dds
/
EmptyTransactionCommitCohort.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/EmptyTransactionCommitCohort.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/EmptyTransactionCommitCohort.java
index 0884ed4a11c7c15476031750a43a933a43d03a4f..5b11d8679e31ba9801a10638228f0bb58504ee15 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/EmptyTransactionCommitCohort.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/EmptyTransactionCommitCohort.java
@@
-8,7
+8,9
@@
package org.opendaylight.controller.cluster.databroker.actors.dds;
import com.google.common.util.concurrent.ListenableFuture;
package org.opendaylight.controller.cluster.databroker.actors.dds;
import com.google.common.util.concurrent.ListenableFuture;
-import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCohort;
+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} for use with empty transactions. This relies on the fact that no backends
/**
* An {@link AbstractTransactionCommitCohort} for use with empty transactions. This relies on the fact that no backends
@@
-20,10
+22,8
@@
import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCoh
* @author Robert Varga
*/
final class EmptyTransactionCommitCohort extends AbstractTransactionCommitCohort {
* @author Robert Varga
*/
final class EmptyTransactionCommitCohort extends AbstractTransactionCommitCohort {
- static final DOMStoreThreePhaseCommitCohort INSTANCE = new EmptyTransactionCommitCohort();
-
- private EmptyTransactionCommitCohort() {
- // Hidden
+ EmptyTransactionCommitCohort(final AbstractClientHistory parent, final TransactionIdentifier txId) {
+ super(parent, txId);
}
@Override
}
@Override
@@
-32,17
+32,19
@@
final class EmptyTransactionCommitCohort extends AbstractTransactionCommitCohort
}
@Override
}
@Override
- public ListenableFuture<
Void
> preCommit() {
- return
VOID
_FUTURE;
+ public ListenableFuture<
Empty
> preCommit() {
+ return
EMPTY
_FUTURE;
}
@Override
}
@Override
- public ListenableFuture<Void> abort() {
- return VOID_FUTURE;
+ public ListenableFuture<Empty> abort() {
+ complete();
+ return EMPTY_FUTURE;
}
@Override
}
@Override
- public ListenableFuture<Void> commit() {
- return VOID_FUTURE;
+ public ListenableFuture<CommitInfo> commit() {
+ complete();
+ return CommitInfo.emptyFluentFuture();
}
}
}
}