Repository: incubator-ignite Updated Branches: refs/heads/ignite-598 013233ee0 -> 7b23b9059
ignite-598: fix some bugs Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7b23b905 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7b23b905 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7b23b905 Branch: refs/heads/ignite-598 Commit: 7b23b905951e64d9fad796ec8b96ec7df553a4b6 Parents: 013233e Author: Artem Shutak <ashu...@gridgain.com> Authored: Mon Mar 30 22:18:22 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Mon Mar 30 22:18:22 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/configuration/CacheConfiguration.java | 1 + .../internal/processors/plugin/CachePluginManager.java | 10 ++++++---- .../apache/ignite/plugin/CachePluginConfiguration.java | 4 +++- 3 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b23b905/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index 7bc06f1..b344777 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -413,6 +413,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> { writeBehindFlushSize = cc.getWriteBehindFlushSize(); writeBehindFlushThreadCnt = cc.getWriteBehindFlushThreadCount(); writeSync = cc.getWriteSynchronizationMode(); + cachePluginCfgs = cc.getCachePluginConfigurations(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b23b905/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 a828122..6260ace 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 @@ -80,11 +80,13 @@ public class CachePluginManager extends GridCacheManagerAdapter { */ public static <C extends CachePluginConfiguration> C cachePluginConfig( CacheConfiguration cfg, Class<C> cl) { - for (CachePluginConfiguration pluginCfg : cfg.getCachePluginConfigurations()) { - if (pluginCfg.getClass() == cl) - return (C)pluginCfg; + if (cfg.getCachePluginConfigurations() != null) { + for (CachePluginConfiguration pluginCfg : cfg.getCachePluginConfigurations()) { + if (pluginCfg.getClass() == cl) + return (C)pluginCfg; + } } - + return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b23b905/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginConfiguration.java b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginConfiguration.java index ca4fae9..9db01a9 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginConfiguration.java @@ -17,10 +17,12 @@ package org.apache.ignite.plugin; +import java.io.*; + /** * TODO: Add class description. */ -public interface CachePluginConfiguration<K, V> { +public interface CachePluginConfiguration<K, V> extends Serializable { /** * @return Cache plugin provider class. * @param ctx
