Repository: ignite Updated Branches: refs/heads/ignite-1537 dc8ab8afe -> 118f29ae0
ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/118f29ae Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/118f29ae Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/118f29ae Branch: refs/heads/ignite-1537 Commit: 118f29ae0e926f774dcde836440814f638d99501 Parents: dc8ab8a Author: sboikov <sboi...@gridgain.com> Authored: Wed Dec 23 08:10:18 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Dec 23 08:10:18 2015 +0300 ---------------------------------------------------------------------- .../dht/atomic/GridNearAtomicUpdateFuture.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/118f29ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java index e617f43..3c86083 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java @@ -845,14 +845,6 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> GridCacheVersion futVer = cctx.versions().next(topVer); - if (storeFuture()) { - if (!cctx.mvcc().addAtomicFuture(futVer, GridNearAtomicUpdateFuture.this)) { - assert isDone() : GridNearAtomicUpdateFuture.this; - - return; - } - } - GridCacheVersion updVer; // Assign version on near node in CLOCK ordering mode even if fastMap is false. @@ -926,6 +918,14 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> return; } + if (storeFuture()) { + if (!cctx.mvcc().addAtomicFuture(futVer, GridNearAtomicUpdateFuture.this)) { + assert isDone() : GridNearAtomicUpdateFuture.this; + + return; + } + } + // Optimize mapping for single key. if (singleReq0 != null) mapSingle(singleReq0.nodeId(), singleReq0);
