Repository: incubator-ignite Updated Branches: refs/heads/ignite-cacheplug-rmtvalid 379c4801e -> d6ca8a5b4
implement remote validation mechanism for CachePlugin (add equals and hashCode to CacheConfiguration) Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d6ca8a5b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d6ca8a5b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d6ca8a5b Branch: refs/heads/ignite-cacheplug-rmtvalid Commit: d6ca8a5b40ecbc8816983ca670dc2e5101e6949f Parents: 379c480 Author: Artem Shutak <ashu...@gridgain.com> Authored: Thu Apr 2 16:26:28 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Thu Apr 2 16:26:28 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 21 ++++++++++++++++++++ .../processors/cache/GridCacheProcessor.java | 2 -- 2 files changed, 21 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6ca8a5b/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 8d5ba6c..2ad4396 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 @@ -1599,6 +1599,27 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> { } /** {@inheritDoc} */ + @Override public boolean equals(Object o) { + if (this == o) + return true; + if (!(o instanceof CacheConfiguration)) + return false; + if (!super.equals(o)) + return false; + + CacheConfiguration that = (CacheConfiguration)o; + + return name == null ? that.name == null : name.equals(that.name); + } + + /** {@inheritDoc} */ + @Override public int hashCode() { + int result = super.hashCode(); + + return 31 * result + (name != null ? name.hashCode() : 0); + } + + /** {@inheritDoc} */ @Override public String toString() { return S.toString(CacheConfiguration.class, this); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6ca8a5b/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 5f05396..d06e6fb 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 @@ -672,8 +672,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { if (filter.apply(locNode)) { CacheObjectContext cacheObjCtx = ctx.cacheObjects().contextForCache(null, ccfg.getName(), ccfg); - System.out.println(">>>>>> ccfg2PluginMgr.get(ccfg)=" + ccfg2PluginMgr.get(ccfg)); - GridCacheContext ctx = createCache(ccfg, ccfg2PluginMgr.get(ccfg), cacheObjCtx); ctx.dynamicDeploymentId(desc.deploymentId());
