Repository: ignite Updated Branches: refs/heads/ignite-1093-2 ad39ce57c -> be4addef0
1093 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8ba913bc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8ba913bc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8ba913bc Branch: refs/heads/ignite-1093-2 Commit: 8ba913bc61e2e22bc6de89e84b5e4f947d723c84 Parents: ad39ce5 Author: Anton Vinogradov <[email protected]> Authored: Tue Oct 20 11:33:52 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Tue Oct 20 11:33:52 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCachePartitionExchangeManager.java | 2 +- .../cache/distributed/dht/preloader/GridDhtPartitionDemander.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8ba913bc/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 ababac1..5251c61 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 @@ -1361,7 +1361,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana } } catch (Exception ex) { - U.error(log, "Failed to send partition demand message to node", ex); + U.error(log, "Failed to send partition demand message to node"); return false; } http://git-wip-us.apache.org/repos/asf/ignite/blob/8ba913bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java index 71d4d58..f5f4c56 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java @@ -980,8 +980,7 @@ public class GridDhtPartitionDemander { return; } - if (!cancelled && !cctx.preloader().syncFuture().isDone() && - cctx.affinity().affinityTopologyVersion().equals(topVer)) + if (!cancelled && !cctx.preloader().syncFuture().isDone()) ((GridFutureAdapter)cctx.preloader().syncFuture()).onDone(); onDone(true);
