Ignite-1093 Backward compatibility failover.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6ea3b5cb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6ea3b5cb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6ea3b5cb Branch: refs/heads/ignite-638 Commit: 6ea3b5cbcdfb97ca07e290924068f692a52679fd Parents: 4ab2bd3 Author: Anton Vinogradov <a...@apache.org> Authored: Mon Nov 9 15:09:36 2015 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Mon Nov 9 19:04:52 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/preloader/GridDhtPartitionDemander.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6ea3b5cb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java index 35cedf9..29ca5f4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java @@ -1191,7 +1191,7 @@ public class GridDhtPartitionDemander { // While. // ===== - while (!topologyChanged(fut)) { + while (!fut.isDone() && !topologyChanged(fut)) { SupplyMessage s = poll(msgQ, timeout); // If timed out. @@ -1350,7 +1350,7 @@ public class GridDhtPartitionDemander { } } } - while (retry && !topologyChanged(fut)); + while (retry && !fut.isDone() && !topologyChanged(fut)); } finally { cctx.io().removeOrderedHandler(d.topic());
