Repository: ignite Updated Branches: refs/heads/ignite-1537 bedd357bc -> 347b90735
ignite-1.5 Fixed GridNearAtomicUpdateFuture to do not complete future before near cache is updated Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/347b9073 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/347b9073 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/347b9073 Branch: refs/heads/ignite-1537 Commit: 347b907351c00890f805d342e328dc5b5fbedbbd Parents: bedd357 Author: sboikov <[email protected]> Authored: Mon Dec 14 15:29:13 2015 +0300 Committer: sboikov <[email protected]> Committed: Mon Dec 14 15:29:13 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/347b9073/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 922a4b5..aee3d36 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 @@ -750,7 +750,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> updateNear(req0, res0); } } - else + else if (!nodeErr) updateNear(req, res); }
