Repository: ignite Updated Branches: refs/heads/ignite-4154-opt2 6d6bfdc35 -> c05e49bb7
ignite-4154 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c05e49bb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c05e49bb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c05e49bb Branch: refs/heads/ignite-4154-opt2 Commit: c05e49bb7a194f6bf5cc5b38121de4532c65111b Parents: 6d6bfdc Author: sboikov <[email protected]> Authored: Mon Nov 14 11:41:03 2016 +0300 Committer: sboikov <[email protected]> Committed: Mon Nov 14 11:41:03 2016 +0300 ---------------------------------------------------------------------- .../dht/preloader/GridDhtPartitionsExchangeFuture.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c05e49bb/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 7c22f4e..9af7a7b 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 @@ -742,7 +742,11 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT if (crd.isLocal()) { ClusterNode node = discoEvt.eventNode(); - if (discoEvt.type() == EVT_NODE_JOINED && !discoEvt.eventNode().isLocal() && Boolean.TRUE.equals(node.attribute("SKIP_FIRST_EXCHANGE_MSG"))) { + Object attr = node.attribute("SKIP_FIRST_EXCHANGE_MSG"); + + boolean skipFirstExchange = Boolean.TRUE.equals(attr) || "true".equals(attr); + + if (discoEvt.type() == EVT_NODE_JOINED && !node.isLocal() && skipFirstExchange) { assert !CU.clientNode(node) : discoEvt; assert srvNodes.contains(node);
