Repository: incubator-ignite Updated Branches: refs/heads/ignite-471-2 60d4d3659 -> 24602670e
ignite-471-2: finished fixing Visor GUI Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/24602670 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/24602670 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/24602670 Branch: refs/heads/ignite-471-2 Commit: 24602670e54c7ea7ae2b4bb916013bcc8e1dfcf5 Parents: 60d4d36 Author: Denis Magda <[email protected]> Authored: Mon May 25 14:40:08 2015 +0300 Committer: Denis Magda <[email protected]> Committed: Mon May 25 14:40:08 2015 +0300 ---------------------------------------------------------------------- .../processors/cacheobject/IgniteCacheObjectProcessor.java | 3 ++- .../cacheobject/IgniteCacheObjectProcessorImpl.java | 8 ++++++-- .../internal/processors/datastreamer/DataStreamerImpl.java | 7 ++++++- .../org/apache/ignite/internal/visor/VisorMultiNodeTask.java | 2 +- 4 files changed, 15 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24602670/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java index c6e85c7..353f0d5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java @@ -117,8 +117,9 @@ public interface IgniteCacheObjectProcessor extends GridProcessor { /** * @return Cache object context. + * @throws IgniteCheckedException If failed. */ - public CacheObjectContext contextForCache(CacheConfiguration ccfg); + public CacheObjectContext contextForCache(CacheConfiguration ccfg) throws IgniteCheckedException; /** * @param ctx Cache context. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24602670/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java index 1565869..9b89d5a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java @@ -185,7 +185,7 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme } /** {@inheritDoc} */ - @Override public CacheObjectContext contextForCache(CacheConfiguration ccfg) { + @Override public CacheObjectContext contextForCache(CacheConfiguration ccfg) throws IgniteCheckedException { assert ccfg != null; CacheMemoryMode memMode = ccfg.getMemoryMode(); @@ -194,10 +194,14 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme GridQueryProcessor.isEnabled(ccfg) || !ccfg.isCopyOnRead(); - return new CacheObjectContext(ctx, + CacheObjectContext res = new CacheObjectContext(ctx, ccfg.getAffinityMapper() != null ? ccfg.getAffinityMapper() : new GridCacheDefaultAffinityKeyMapper(), ccfg.isCopyOnRead() && memMode != OFFHEAP_VALUES, storeVal); + + ctx.resource().injectGeneric(res.defaultAffMapper()); + + return res; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24602670/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java index db3d350..baa1a63 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java @@ -183,7 +183,12 @@ public class DataStreamerImpl<K, V> implements IgniteDataStreamer<K, V>, Delayed CacheConfiguration ccfg = ctx.cache().cacheConfiguration(cacheName); - this.cacheObjCtx = ctx.cacheObjects().contextForCache(ccfg); + try { + this.cacheObjCtx = ctx.cacheObjects().contextForCache(ccfg); + } catch (IgniteCheckedException e) { + throw new IgniteException("Failed to initialize cache context"); + } + this.cacheName = cacheName; this.flushQ = flushQ; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24602670/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java index 7295760..9eda849 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java @@ -39,7 +39,7 @@ import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*; public abstract class VisorMultiNodeTask<A, R, J> implements ComputeTask<VisorTaskArgument<A>, R> { /** Auto-injected grid instance. */ @IgniteInstanceResource - protected IgniteEx ignite; + protected transient IgniteEx ignite; /** Debug flag. */ protected boolean debug;
