Repository: ignite Updated Branches: refs/heads/ignite-comm-balance-master e753128c1 -> 315ddeee1
fixing tests Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/315ddeee Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/315ddeee Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/315ddeee Branch: refs/heads/ignite-comm-balance-master Commit: 315ddeee120689065acc126052a4fc7ec15d2fcd Parents: e753128 Author: Yakov Zhdanov <[email protected]> Authored: Tue Feb 7 16:27:20 2017 +0700 Committer: Yakov Zhdanov <[email protected]> Committed: Tue Feb 7 16:27:20 2017 +0700 ---------------------------------------------------------------------- .../dht/atomic/GridDhtAtomicAbstractUpdateFuture.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/315ddeee/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java index 3ba8579..4cb113e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java @@ -115,7 +115,9 @@ public abstract class GridDhtAtomicAbstractUpdateFuture extends GridFutureAdapte ) { this.cctx = cctx; - this.futVer = updateReq.futureVersion(); + this.futVer = cctx.isLocalNode(updateRes.nodeId()) ? + cctx.versions().next(updateReq.topologyVersion()) : // Generate new if request mapped to local. + updateReq.futureVersion(); this.updateReq = updateReq; this.completionCb = completionCb; this.updateRes = updateRes;
