Repository: incubator-ignite Updated Branches: refs/heads/ignite-858 [created] 396f2f312
IGNITE-858 - Fixed NPE Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/396f2f31 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/396f2f31 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/396f2f31 Branch: refs/heads/ignite-858 Commit: 396f2f31207e9fa5133e2a669d50f3d998fae2f3 Parents: c4bc929 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Mon May 4 17:32:15 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Mon May 4 17:32:15 2015 -0700 ---------------------------------------------------------------------- .../processors/cache/GridCachePartitionExchangeManager.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/396f2f31/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java index 5f82ae2..61ea0a9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java @@ -745,6 +745,9 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana int skipped = 0; for (GridDhtPartitionsExchangeFuture fut : exchFuts0.values()) { + if (exchFut.exchangeId().topologyVersion().compareTo(fut.exchangeId().topologyVersion()) < 0) + continue; + skipped++; if (skipped == EXCH_FUT_CLEANUP_HISTORY_SIZE) {
