ignite-950: merging from sprint-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/204a408f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/204a408f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/204a408f Branch: refs/heads/ignite-950 Commit: 204a408f9176b9e193570542851a01d32c5a2994 Parents: b730116 Author: Denis Magda <dma...@gridgain.com> Authored: Fri Jun 12 16:38:32 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Fri Jun 12 16:38:32 2015 +0300 ---------------------------------------------------------------------- .../processors/cacheobject/IgniteCacheObjectProcessorImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/204a408f/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 3e59b10..c9f3444 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 @@ -197,7 +197,8 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme CacheObjectContext res = new CacheObjectContext(ctx, ccfg.getAffinityMapper() != null ? ccfg.getAffinityMapper() : new GridCacheDefaultAffinityKeyMapper(), ccfg.isCopyOnRead() && memMode != OFFHEAP_VALUES, - storeVal); + storeVal, + GridCacheUtils.isSystemCache(ccfg.getName())); ctx.resource().injectGeneric(res.defaultAffMapper());