You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/07/24 08:57:29 UTC
[16/16] ignite git commit: 5578
5578
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0e26a8fe
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0e26a8fe
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0e26a8fe
Branch: refs/heads/ignite-5578
Commit: 0e26a8feebed0c44eb3cbbc77325a3e17fb481d6
Parents: 530ca72
Author: sboikov <sb...@gridgain.com>
Authored: Mon Jul 24 11:57:06 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Jul 24 11:57:06 2017 +0300
----------------------------------------------------------------------
.../preloader/GridDhtPartitionsExchangeFuture.java | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0e26a8fe/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 5d40084..3674276 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
@@ -1226,19 +1226,21 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
}
if (cctx.kernalContext().clientNode()) {
- msg = newGridDhtPartitionsSingleMessage (exchangeId(),
+ msg = new GridDhtPartitionsSingleMessage(exchangeId(),
true,
null,
true);
}
else {
- msg = cctx.exchange().createPartitionsSingleMessage(
- exchangeId(), false, true);}
+ msg = cctx.exchange().createPartitionsSingleMessage(exchangeId(),
+ false,
+ true);
Map<Integer, Map<Integer, Long>> partHistReserved0 = partHistReserved;
- if (partHistReserved0 != null)
- msg.partitionHistoryCounters(partHistReserved0);}
+ if (partHistReserved0 != null)
+ msg.partitionHistoryCounters(partHistReserved0);
+ }
if (stateChangeExchange() && changeGlobalStateE != null)
msg.setError(changeGlobalStateE);
@@ -1647,7 +1649,8 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
public void onReceiveSingleMessage(final ClusterNode node, final GridDhtPartitionsSingleMessage msg) {
assert !node.isDaemon() : node;
assert msg != null;
- assert exchId.equals(msg.exchangeId()) : msg;assert !cctx.kernalContext().clientNode();
+ assert exchId.equals(msg.exchangeId()) : msg;
+ assert !cctx.kernalContext().clientNode();
if (msg.restoreState()) {
InitNewCoordinatorFuture newCrdFut0;
@@ -1665,7 +1668,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
if (!msg.client()) {
-if (!msg.client()) { assert msg.lastVersion() != null : msg;
+ assert msg.lastVersion() != null : msg;
updateLastVersion(msg.lastVersion());
}