IGNITE-5789: code review fixes
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fb1fb643 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fb1fb643 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fb1fb643 Branch: refs/heads/ignite-5789-1 Commit: fb1fb643b41d951bf30e9af77eb6c190b76226cb Parents: bfa7dc4 Author: vk <kaligula...@gmail.com> Authored: Tue Apr 24 18:56:01 2018 +0300 Committer: vk <kaligula...@gmail.com> Committed: Tue Apr 24 18:56:01 2018 +0300 ---------------------------------------------------------------------- .../dht/preloader/GridDhtPartitionsExchangeFuture.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fb1fb643/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index 31b7776..fb5c107 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -734,16 +734,19 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte */ private void ensureClientCachesStarted() { GridCacheProcessor cacheProcessor = cctx.cache(); + + Set<String> cacheNames = new HashSet<>(cacheProcessor.cacheNames()); + List<CacheConfiguration> notStartedCacheConfigs = new ArrayList<>(); + for (CacheConfiguration cCfg : cctx.gridConfig().getCacheConfiguration()) { - if (!cacheProcessor.cacheNames().contains(cCfg.getName())) { + if (!cacheNames.contains(cCfg.getName())) { notStartedCacheConfigs.add(cCfg); } } - if (!notStartedCacheConfigs.isEmpty()) { + if (!notStartedCacheConfigs.isEmpty()) cacheProcessor.dynamicStartCaches(notStartedCacheConfigs, false, false); - } } /**