#IGNITE-GG-10440 Fixed review notes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c5287050 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c5287050 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c5287050 Branch: refs/heads/ignite-648-failover Commit: c5287050d47e97a8ae817879d7d7f2797f164348 Parents: b2e8fea Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Thu Jun 25 10:39:01 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Thu Jun 25 10:39:01 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/internal/GridKernalContextImpl.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5287050/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java index 737dbee..65107a7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java @@ -790,6 +790,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable if (cls.equals(IgniteCacheObjectProcessor.class)) return (T)new IgniteCacheObjectProcessorImpl(this); + if (cls.equals(CacheConflictResolutionManager.class)) return null;
