Fixed RendezvousAffinityFunction.hashIdResolver compatibility.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6e19979b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6e19979b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6e19979b Branch: refs/heads/ignite-gg-10760 Commit: 6e19979b329d266d3be2f4abe2bdbd8dd443d64d Parents: c257e07 Author: sboikov <sboi...@gridgain.com> Authored: Tue Sep 15 15:57:03 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Sep 15 15:57:03 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheProcessor.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6e19979b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 4317f70..4ae0baa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -232,16 +232,14 @@ public class GridCacheProcessor extends GridProcessorAdapter { if (cfg.getCacheMode() == PARTITIONED) { RendezvousAffinityFunction aff = new RendezvousAffinityFunction(); - if (internalCache) - aff.setHashIdResolver(new AffinityNodeAddressHashResolver()); + aff.setHashIdResolver(new AffinityNodeAddressHashResolver()); cfg.setAffinity(aff); } else if (cfg.getCacheMode() == REPLICATED) { RendezvousAffinityFunction aff = new RendezvousAffinityFunction(false, 512); - if (internalCache) - aff.setHashIdResolver(new AffinityNodeAddressHashResolver()); + aff.setHashIdResolver(new AffinityNodeAddressHashResolver()); cfg.setAffinity(aff); @@ -251,11 +249,11 @@ public class GridCacheProcessor extends GridProcessorAdapter { cfg.setAffinity(new LocalAffinityFunction()); } else { - if (cfg.getCacheMode() == PARTITIONED) { + if (cfg.getCacheMode() != LOCAL) { if (cfg.getAffinity() instanceof RendezvousAffinityFunction) { RendezvousAffinityFunction aff = (RendezvousAffinityFunction)cfg.getAffinity(); - if (internalCache && aff.getHashIdResolver() == null) + if (aff.getHashIdResolver() == null) aff.setHashIdResolver(new AffinityNodeAddressHashResolver()); } }
