# Merge remote-tracking branch 'remotes/origin/master' into ignite-901
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6133882e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6133882e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6133882e Branch: refs/heads/ignite-901 Commit: 6133882e1d4cf3ef4b41ec25e1fdcf2a37fc93e6 Parents: f2c7f6f 77da728 Author: sboikov <sboi...@gridgain.com> Authored: Thu Jul 16 09:35:56 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jul 16 09:35:56 2015 +0300 ---------------------------------------------------------------------- .../discovery/GridDiscoveryManager.java | 33 ++++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6133882e/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 9650307,b35628c..f3c7589 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@@ -476,9 -467,13 +479,14 @@@ public class GridDiscoveryManager exten // If this is a local join event, just save it and do not notify listeners. if (type == EVT_NODE_JOINED && node.id().equals(locNode.id())) { + if (gridStartTime == 0) + gridStartTime = getSpi().getGridStartTime(); + + updateTopologyVersionIfGreater(new AffinityTopologyVersion(locNode.order()), + new DiscoCache(localNode(), getSpi().getRemoteNodes())); + - assert startLatch.getCount() == 1; - + startLatch.countDown(); + DiscoveryEvent discoEvt = new DiscoveryEvent(); discoEvt.node(ctx.discovery().localNode());
