Fixed formatting.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4fc8124d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4fc8124d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4fc8124d Branch: refs/heads/ignite-2.1 Commit: 4fc8124d9538625cb0a95c918634b43ec1319bee Parents: ab52671 Author: sboikov <sboi...@gridgain.com> Authored: Fri Jul 7 14:43:28 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Jul 7 14:43:28 2017 +0300 ---------------------------------------------------------------------- .../dht/GridDhtPartitionTopologyImpl.java | 40 ++++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4fc8124d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java index 3e98b01..320ef06 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java @@ -440,18 +440,16 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { U.writeLock(lock); - try { - - - if (stopping) - return; + try { + if (stopping) + return; - GridDhtPartitionExchangeId exchId = exchFut.exchangeId();assert topVer.equals(exchId.topologyVersion()) : "Invalid topology version [topVer=" + - topVer + ", exchId=" + exchId + ']'; + GridDhtPartitionExchangeId exchId = exchFut.exchangeId();assert topVer.equals(exchId.topologyVersion()) : "Invalid topology version [topVer=" + + topVer + ", exchId=" + exchId + ']'; if (exchId.isLeft() && exchFut.serverNodeDiscoveryEvent()) removeNode(exchId.nodeId()); - + ClusterNode oldest = discoCache.oldestAliveServerNodeWithCache(); if (log.isDebugEnabled()) @@ -461,10 +459,11 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { cntrMap.clear(); - boolean grpStarted = exchFut.cacheGroupAddedOnExchange(grp.groupId(), grp.receivedFrom());// If this is the oldest node. - if (oldest != null && (loc.equals(oldest) || grpStarted)) { - if (node2part == null) { - node2part = new GridDhtPartitionFullMap(oldest.id(), oldest.order(), updateSeq); + boolean grpStarted = exchFut.cacheGroupAddedOnExchange(grp.groupId(), grp.receivedFrom());// If this is the oldest node. + + if (oldest != null && (loc.equals(oldest) || grpStarted)) { + if (node2part == null) { + node2part = new GridDhtPartitionFullMap(oldest.id(), oldest.order(), updateSeq); if (log.isDebugEnabled()) log.debug("Created brand new full topology map on oldest node [exchId=" + @@ -486,16 +485,17 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { } } - if (grpStarted || - exchFut.discoveryEvent().type() == EVT_DISCOVERY_CUSTOM_EVT || - exchFut.serverNodeDiscoveryEvent()) {if (affReady) - initPartitions0(exchFut, updateSeq); - else { - List<List<ClusterNode>> aff = grp.affinity().idealAssignment(); + if (grpStarted || + exchFut.discoveryEvent().type() == EVT_DISCOVERY_CUSTOM_EVT || + exchFut.serverNodeDiscoveryEvent()) { + if (affReady) + initPartitions0(exchFut, updateSeq); + else { + List<List<ClusterNode>> aff = grp.affinity().idealAssignment(); - createPartitions(aff, updateSeq); + createPartitions(aff, updateSeq); + } } - } consistencyCheck();