From 626168e11e0ec70abb4539bb897aabeb07b39698 Mon Sep 17 00:00:00 2001
From: Semyon Danilov <samvimes@yandex.ru>
Date: Tue, 18 May 2021 15:27:52 +0300
Subject: [PATCH] IGNITE-14729 Fix race condition in ClientImpl (#9102)

---
 .../java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index 794382dee52e8..208e2c074ab02 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@ -2330,12 +2330,12 @@ private void processNodeAddFinishedMessage(TcpDiscoveryNodeAddFinishedMessage ms
 
                     Collection<ClusterNode> nodes = updateTopologyHistory(topVer, msg);
 
-                    notifyDiscovery(EVT_NODE_JOINED, topVer, locNode, nodes, msg.spanContainer());
-
                     boolean disconnected = disconnected();
 
                     state = CONNECTED;
 
+                    notifyDiscovery(EVT_NODE_JOINED, topVer, locNode, nodes, msg.spanContainer());
+
                     if (disconnected) {
                         notifyDiscovery(EVT_CLIENT_NODE_RECONNECTED, topVer, locNode, nodes, null);