Repository: incubator-ignite Updated Branches: refs/heads/ignite-443 18cc38489 -> 9321b405b
#IGNITE-443 Fixed conflict resolver manager. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9321b405 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9321b405 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9321b405 Branch: refs/heads/ignite-443 Commit: 9321b405b755d36f382a1ef69f5a5c343f026607 Parents: 18cc384 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Thu Mar 12 12:35:57 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Thu Mar 12 12:35:57 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/IgniteCacheConflictResolverManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9321b405/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheConflictResolverManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheConflictResolverManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheConflictResolverManager.java index dfb01d7..72fee3f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheConflictResolverManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheConflictResolverManager.java @@ -30,7 +30,7 @@ public class IgniteCacheConflictResolverManager<K ,V> extends CacheConflictResol if (cctx.store().isLocalStore()) return new GridCacheVersionConflictResolver(cctx.config().getConflictResolverMode(), cctx.config().getConflictResolver()); - else - return null; + + return null; } }
