Repository: ignite Updated Branches: refs/heads/ignite-6778 ba9cee15a -> 44d582035
IGNITE-6778 Fixed NPE on node filter exchange Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/44d58203 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/44d58203 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/44d58203 Branch: refs/heads/ignite-6778 Commit: 44d582035b338d71f13bb8a9a84770b1142813ee Parents: ba9cee1 Author: Alexey Goncharuk <[email protected]> Authored: Wed Nov 1 16:53:50 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Wed Nov 1 16:53:50 2017 +0300 ---------------------------------------------------------------------- .../dht/preloader/GridDhtPartitionsExchangeFuture.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/44d58203/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 5dd3f0a..d29293e 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 @@ -2450,14 +2450,12 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte if (grpDesc.config().getCacheMode() == CacheMode.LOCAL) continue; - GridDhtPartitionTopology top; + if (!CU.isPersistentCache(grpDesc.config(), cctx.gridConfig().getDataStorageConfiguration())) + continue; CacheGroupContext grpCtx = cctx.cache().cacheGroup(e.getKey()); - if (!grpCtx.persistenceEnabled()) - continue; - - top = grpCtx != null ? + GridDhtPartitionTopology top = grpCtx != null ? grpCtx.topology() : cctx.exchange().clientTopology(e.getKey(), events().discoveryCache());
