Repository: ignite Updated Branches: refs/heads/ignite-1124-debug a9ae0f92a -> 610cc88fd
ignite-1124-debug Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/610cc88f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/610cc88f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/610cc88f Branch: refs/heads/ignite-1124-debug Commit: 610cc88fd561b21df3795a6fd4e3ce9cccfc4012 Parents: a9ae0f9 Author: sboikov <[email protected]> Authored: Mon Aug 24 15:05:02 2015 +0300 Committer: sboikov <[email protected]> Committed: Mon Aug 24 15:05:02 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/atomic/GridNearAtomicUpdateFuture.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/610cc88f/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 24e0e75..d0c410c 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 @@ -161,6 +161,9 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> @GridToStringInclude private volatile AffinityTopologyVersion waitTopVer; + @GridToStringInclude + private volatile boolean waitingForTopChange; + /** * @param cctx Cache context. * @param cache Cache instance. @@ -641,8 +644,12 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> } else { if (waitTopFut) { + waitingForTopChange = true; + fut.listen(new CI1<IgniteInternalFuture<AffinityTopologyVersion>>() { @Override public void apply(IgniteInternalFuture<AffinityTopologyVersion> t) { + waitingForTopChange = false; + cctx.kernalContext().closure().runLocalSafe(new Runnable() { @Override public void run() { mapOnTopology(keys, remap, oldNodeId);
