Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG-7033: Fix commit exception due to pipe-lining
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
SimpleShardDataTreeCohort.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/SimpleShardDataTreeCohort.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/SimpleShardDataTreeCohort.java
index 8d947e8c561e175e29472f1d143eca3c13b22bc4..197c90a60bd62ea15aff24b23b1e17d9a47c5cfa 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/SimpleShardDataTreeCohort.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/SimpleShardDataTreeCohort.java
@@
-212,6
+212,12
@@
final class SimpleShardDataTreeCohort extends ShardDataTreeCohort {
switchState(State.FAILED).onFailure(cause);
}
switchState(State.FAILED).onFailure(cause);
}
+ void finishCommitPending() {
+ checkState(State.COMMIT_PENDING);
+ // We want to switch the state but keep the callback.
+ callback = switchState(State.FINISH_COMMIT_PENDING);
+ }
+
@Override
public State getState() {
return state;
@Override
public State getState() {
return state;