# ignite-742
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4fe2a9a6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4fe2a9a6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4fe2a9a6 Branch: refs/heads/ignite-446 Commit: 4fe2a9a6b9112f38ef41e84adc42871ce425d113 Parents: fb74a83 Author: sboikov <sboi...@gridgain.com> Authored: Wed Apr 15 09:17:03 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Apr 15 09:17:03 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridPartitionedGetFuture.java | 9 +++++++-- .../cache/distributed/near/GridNearGetFuture.java | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fe2a9a6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java index d5db26d..f37daf8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java @@ -203,15 +203,20 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M /** {@inheritDoc} */ @Override public boolean onNodeLeft(UUID nodeId) { + boolean found = false; + for (IgniteInternalFuture<Map<K, V>> fut : futures()) if (isMini(fut)) { MiniFuture f = (MiniFuture)fut; - if (f.node().id().equals(nodeId)) + if (f.node().id().equals(nodeId)) { + found = true; + f.onNodeLeft(new ClusterTopologyCheckedException("Remote node left grid (will retry): " + nodeId)); + } } - return false; + return found; } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fe2a9a6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java index b1638ca..e75c49e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java @@ -203,15 +203,20 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma /** {@inheritDoc} */ @Override public boolean onNodeLeft(UUID nodeId) { + boolean found = false; + for (IgniteInternalFuture<Map<K, V>> fut : futures()) if (isMini(fut)) { MiniFuture f = (MiniFuture)fut; - if (f.node().id().equals(nodeId)) + if (f.node().id().equals(nodeId)) { + found = true; + f.onNodeLeft(new ClusterTopologyCheckedException("Remote node left grid (will retry): " + nodeId)); + } } - return false; + return found; } /**
