Merge remote-tracking branch 'remotes/origin/master' into ignite-5075-cacheStart
# Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b324c13b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b324c13b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b324c13b Branch: refs/heads/ignite-5075 Commit: b324c13b3e622ea7a1150b9a67fb65752a8ffb23 Parents: 88b207d Author: sboikov <[email protected]> Authored: Thu May 11 13:11:03 2017 +0300 Committer: sboikov <[email protected]> Committed: Thu May 11 13:11:03 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheProcessor.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b324c13b/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 e60f261..82db451 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 @@ -728,6 +728,8 @@ public class GridCacheProcessor extends GridProcessorAdapter { for (int i = 0; i < cfgs.length; i++) { CacheConfiguration<?, ?> cfg = new CacheConfiguration(cfgs[i]); + cfgs[i] = cfg; // Replace original configuration value. + registerCache(cfg, caches, templates); } }
