ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [15/17] ignite git commit: ignite-5075
Date Wed, 17 May 2017 10:32:54 GMT
ignite-5075


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6f194b39
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6f194b39
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6f194b39

Branch: refs/heads/ignite-5075
Commit: 6f194b398e696379291a1bd92853783214458d72
Parents: cc31415
Author: sboikov <sboikov@gridgain.com>
Authored: Wed May 17 11:21:16 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed May 17 11:21:16 2017 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/ClusterCachesInfo.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6f194b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
index 5552841..45eca44 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
@@ -146,7 +146,10 @@ class ClusterCachesInfo {
             CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "cachePreloadMode",
                 "Cache preload mode", locAttr.cacheRebalanceMode(), rmtAttr.cacheRebalanceMode(),
true);
 
-            if (CU.affinityNode(ctx.discovery().localNode(), locCfg.getNodeFilter())) {
+            ClusterNode rmtNode = ctx.discovery().node(rmt);
+
+            if (CU.affinityNode(ctx.discovery().localNode(), locCfg.getNodeFilter())
+                && rmtNode != null && CU.affinityNode(rmtNode, rmtCfg.getNodeFilter()))
{
                 CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "storeFactory",
"Store factory",
                     locAttr.storeFactoryClassName(), rmtAttr.storeFactoryClassName(), true);
             }


Mime
View raw message