# ignite-283: WIP.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f3b57316 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f3b57316 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f3b57316 Branch: refs/heads/ignite-283 Commit: f3b5731621c1eabc55e199af8a9711ab542cf198 Parents: b4045ce Author: vozerov-gridgain <voze...@gridgain.com> Authored: Wed Feb 18 11:53:34 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Wed Feb 18 11:53:34 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheContext.java | 5 +++++ .../ignite/internal/processors/cache/GridCacheProcessor.java | 4 ++++ 2 files changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f3b57316/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index 060a825..3ec013c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -320,7 +320,12 @@ public class GridCacheContext<K, V> implements Externalizable { expiryPlc = null; itHolder = new CacheWeakQueryIteratorsHolder(log); + } + /** + * Initialize conflict resolver after all managers are started. + */ + void initConflictResolver() { // Conflict resolver is determined in two stages: // 1. If DR receiver hub is enabled, then pick it from DR manager. // 2. Otherwise instantiate default resolver in case local store is configured. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f3b57316/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 d038e91..e99c706 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 @@ -854,6 +854,8 @@ public class GridCacheProcessor extends GridProcessorAdapter { for (GridCacheManager mgr : F.view(cacheCtx.managers(), F.notContains(dhtExcludes(cacheCtx)))) mgr.start(cacheCtx); + cacheCtx.initConflictResolver(); + if (cfg.getCacheMode() != LOCAL && GridCacheUtils.isNearEnabled(cfg)) { GridCacheContext<?, ?> dhtCtx = cacheCtx.near().dht().context(); @@ -861,6 +863,8 @@ public class GridCacheProcessor extends GridProcessorAdapter { for (GridCacheManager mgr : dhtManagers(dhtCtx)) mgr.start(dhtCtx); + dhtCtx.initConflictResolver(); + // Start DHT cache. dhtCtx.cache().start();
