You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/19 17:23:52 UTC
incubator-ignite git commit: #IGNITE-GG-10440 If cache plugin manager
doesn't provide CacheConflictResolutionManager than Plugin provider create
defaule conflict resolution.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-gg-10440 [created] 987d91e28
#IGNITE-GG-10440 If cache plugin manager doesn't provide CacheConflictResolutionManager than Plugin provider create defaule conflict resolution.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/987d91e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/987d91e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/987d91e2
Branch: refs/heads/ignite-gg-10440
Commit: 987d91e2804cace7acb846a7d61b0f5bdc1c3442
Parents: d006389
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Fri Jun 19 18:23:38 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Fri Jun 19 18:23:38 2015 +0300
----------------------------------------------------------------------
.../internal/processors/plugin/CachePluginManager.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/987d91e2/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java
index 640271a..ae69eb8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java
@@ -105,8 +105,14 @@ public class CachePluginManager extends GridCacheManagerAdapter {
if (cls.equals(GridCacheDrManager.class))
return (T)new GridOsCacheDrManager();
- else if (cls.equals(CacheConflictResolutionManager.class))
- return (T)new CacheOsConflictResolutionManager<>();
+ else if (cls.equals(CacheConflictResolutionManager.class)) {
+ T cmp = (T)ctx.createComponent(CacheConflictResolutionManager.class);
+
+ if (cmp != null)
+ return cmp;
+ else
+ return (T)new CacheOsConflictResolutionManager<>();
+ }
else if (cls.equals(CacheStoreManager.class))
return (T)new CacheOsStoreManager(ctx, cfg);