Repository: ignite Updated Branches: refs/heads/ignite-5075 32b43db7f -> 63fa2bd19
ignite-5075 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/63fa2bd1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/63fa2bd1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/63fa2bd1 Branch: refs/heads/ignite-5075 Commit: 63fa2bd193cac7f0f3ba5b7136c905136e157f24 Parents: 32b43db Author: sboikov <[email protected]> Authored: Mon May 29 12:00:01 2017 +0300 Committer: sboikov <[email protected]> Committed: Mon May 29 12:00:01 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheProcessor.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/63fa2bd1/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 3a380a3..21dc5ea 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 @@ -539,6 +539,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { */ private void prepare(CacheConfiguration cfg, Collection<Object> objs) throws IgniteCheckedException { prepare(cfg, cfg.getEvictionPolicy(), false); + prepare(cfg, cfg.getAffinity(), false); prepare(cfg, cfg.getAffinityMapper(), false); prepare(cfg, cfg.getEvictionFilter(), false); prepare(cfg, cfg.getInterceptor(), false); @@ -575,6 +576,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { CacheConfiguration cfg = cctx.config(); cleanup(cfg, cfg.getEvictionPolicy(), false); + cleanup(cfg, cfg.getAffinity(), false); cleanup(cfg, cfg.getAffinityMapper(), false); cleanup(cfg, cfg.getEvictionFilter(), false); cleanup(cfg, cfg.getInterceptor(), false); @@ -1221,8 +1223,13 @@ public class GridCacheProcessor extends GridProcessorAdapter { cacheCtx.onStarted(); - if (log.isInfoEnabled()){ - log.info("Started cache [name=" + cfg.getName() +(cfg.getGroupName() != null ? ", group=" + cfg.getGroupName() : "") + ", memoryPolicyName=" + cfg.getMemoryPolicyName() + ", mode=" + cfg.getCacheMode() +", atomicity=" + cfg.getAtomicityMode() + ']');} + if (log.isInfoEnabled()) { + log.info("Started cache [name=" + cfg.getName() + + (cfg.getGroupName() != null ? ", group=" + cfg.getGroupName() : "") + + ", memoryPolicyName=" + cfg.getMemoryPolicyName() + + ", mode=" + cfg.getCacheMode() + + ", atomicity=" + cfg.getAtomicityMode() + ']'); + } } /** @@ -3447,6 +3454,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { private Iterable<Object> lifecycleAwares(CacheConfiguration ccfg, Object... objs) { Collection<Object> ret = new ArrayList<>(7 + objs.length); + ret.add(ccfg.getAffinity()); ret.add(ccfg.getAffinityMapper()); ret.add(ccfg.getEvictionFilter()); ret.add(ccfg.getEvictionPolicy());
