Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add assertNotNull to prevent null analysis warnings"
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
ChainedTransactionProxy.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ChainedTransactionProxy.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ChainedTransactionProxy.java
index c59a277fa867860355f00bc1ba47439fb98035e7..ed3aa85c1fc5cd56b1a8f05f88bf871a995b9804 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ChainedTransactionProxy.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ChainedTransactionProxy.java
@@
-44,10
+44,12
@@
final class ChainedTransactionProxy extends TransactionProxy {
}
@Override
}
@Override
- protected void onTransactionReady(List<Future<ActorSelection>> readyFutures) {
+ public AbstractThreePhaseCommitCohort ready() {
+ final AbstractThreePhaseCommitCohort ret = super.ready();
+ readyFutures = ret.getCohortFutures();
LOG.debug("onTransactionReady {} pending readyFutures size {} chain {}", getIdentifier(),
LOG.debug("onTransactionReady {} pending readyFutures size {} chain {}", getIdentifier(),
-
readyFutures.size(), getTransactionChainId());
-
this.readyFutures = readyFutures
;
+ readyFutures.size(), getTransactionChainId());
+
return ret
;
}
/**
}
/**