Repository: ignite Updated Branches: refs/heads/ignite-5075 9db0d4862 -> 927726dad
ignite-5075 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/927726da Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/927726da Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/927726da Branch: refs/heads/ignite-5075 Commit: 927726dadc3ac03f5db1f9f558ca7abcb96a30be Parents: 9db0d48 Author: sboikov <[email protected]> Authored: Tue May 30 09:07:12 2017 +0300 Committer: sboikov <[email protected]> Committed: Tue May 30 09:07:12 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/927726da/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 3fa7adf..82771b0 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 @@ -1192,8 +1192,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { private void startCache(GridCacheAdapter<?, ?> cache, QuerySchema schema) throws IgniteCheckedException { GridCacheContext<?, ?> cacheCtx = cache.context(); - ctx.continuous().onCacheStart(cacheCtx); - if (sharedCtx.pageStore() != null) sharedCtx.pageStore().initializeForCache(cacheCtx.config()); @@ -1209,6 +1207,8 @@ 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)) {
