IGNITE-45 - Fixed assertions from example.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/77d7eb8f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/77d7eb8f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/77d7eb8f Branch: refs/heads/ignite-45 Commit: 77d7eb8f1a6074aba2cc4a543d528c03ccc95035 Parents: 074d6dd Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Thu Mar 19 13:49:21 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Thu Mar 19 13:49:21 2015 -0700 ---------------------------------------------------------------------- .../internal/managers/discovery/GridDiscoveryManager.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77d7eb8f/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 934de63..09f4a15 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -2418,7 +2418,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { * @return {@code True} if this node is a data node for given cache. */ public boolean dataNode(ClusterNode node) { - return cacheFilter.apply(node); + return !node.isDaemon() && cacheFilter.apply(node); } /** @@ -2426,7 +2426,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { * @return {@code True} if cache is accessible on the given node. */ public boolean cacheNode(ClusterNode node) { - return cacheFilter.apply(node) || clientNodes.containsKey(node.id()); + return !node.isDaemon() && (cacheFilter.apply(node) || clientNodes.containsKey(node.id())); } /** @@ -2434,6 +2434,9 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { * @return {@code True} if near cache is present on the given nodes. */ public boolean nearNode(ClusterNode node) { + if (node.isDaemon()) + return false; + if (nearEnabled && cacheFilter.apply(node)) return true; @@ -2447,6 +2450,9 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { * @return {@code True} if near cache is present on the given nodes. */ public boolean clientNode(ClusterNode node) { + if (node.isDaemon()) + return false; + Boolean near = clientNodes.get(node.id()); return near != null && !near;
