Repository: incubator-ignite Updated Branches: refs/heads/ignite-45 8656001e5 -> f3b49a553
# Cleanup code. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f3b49a55 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f3b49a55 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f3b49a55 Branch: refs/heads/ignite-45 Commit: f3b49a5533fbac9886c870b33375ccf2aedaff2d Parents: 8656001 Author: sevdokimov <sevdoki...@gridgain.com> Authored: Thu Mar 19 16:21:40 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Thu Mar 19 16:21:40 2015 +0300 ---------------------------------------------------------------------- .../cache/GridCachePartitionExchangeManager.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f3b49a55/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 36bafdf..88bc892 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 @@ -88,7 +88,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana private final ConcurrentMap<Integer, GridClientPartitionTopology> clientTops = new ConcurrentHashMap8<>(); /** */ - private volatile GridDhtPartitionsExchangeFuture lastInitializedFuture; + private volatile GridDhtPartitionsExchangeFuture lastInitializedFut; /** * Partition map futures. @@ -105,9 +105,9 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana if (!enterBusy()) return; - DiscoveryEvent e = (DiscoveryEvent)evt; - try { + DiscoveryEvent e = (DiscoveryEvent)evt; + ClusterNode loc = cctx.localNode(); assert e.type() == EVT_NODE_JOINED || e.type() == EVT_NODE_LEFT || e.type() == EVT_NODE_FAILED || @@ -370,14 +370,14 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana * @return Topology version. */ public AffinityTopologyVersion topologyVersion() { - return lastInitializedFuture.exchangeId().topologyVersion(); + return lastInitializedFut.exchangeId().topologyVersion(); } /** * @return Last completed topology future. */ public GridDhtTopologyFuture lastTopologyFuture() { - return lastInitializedFuture; + return lastInitializedFut; } /** @@ -893,7 +893,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana break; if (!exchFut.dummy() && !exchFut.forcePreload()) { - lastInitializedFuture = exchFut; + lastInitializedFut = exchFut; exchFut.init();
