Repository: ignite Updated Branches: refs/heads/ignite-5075 76e059664 -> 3efd652c6
cc Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3efd652c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3efd652c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3efd652c Branch: refs/heads/ignite-5075 Commit: 3efd652c6d2e840766e6daa204d6e574bfecbcb4 Parents: 76e0596 Author: sboikov <sboi...@gridgain.com> Authored: Wed May 31 01:44:41 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed May 31 01:44:41 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3efd652c/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 bee7860..ad33b93 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 @@ -1207,8 +1207,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { for (GridCacheManager mgr : F.view(cacheCtx.managers(), F.notContains(dhtExcludes(cacheCtx)))) mgr.start(cacheCtx); - ctx.continuous().onCacheStart(cacheCtx); - cacheCtx.initConflictResolver(); if (cfg.getCacheMode() != LOCAL && GridCacheUtils.isNearEnabled(cfg)) { @@ -1227,6 +1225,8 @@ public class GridCacheProcessor extends GridProcessorAdapter { log.debug("Started DHT cache: " + dhtCtx.cache().name()); } + ctx.continuous().onCacheStart(cacheCtx); + cacheCtx.cache().start(); ctx.query().onCacheStart(cacheCtx, schema);
