Fix avoid race conditions (#3471)

* Introduced enums instead multiple bool flags

Update threadFunc logic
Update Start logic
Update Stop logic
Update Join logic

* Update of the affected code

* UTs update

Co-authored-by: sniukalov <sniukaov@luxoft.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/components/connection_handler/src/connection.cc b/src/components/connection_handler/src/connection.cc
index 304be9ddb0..9dcf2540a4 100644
--- a/src/components/connection_handler/src/connection.cc
+++ b/src/components/connection_handler/src/connection.cc
@@ -89,12 +89,12 @@ Connection::Connection(ConnectionHandle connection_handle,
   heartbeat_monitor_ = new HeartBeatMonitor(heartbeat_timeout_, this);
   heart_beat_monitor_thread_ =
       threads::CreateThread("HeartBeatMonitor", heartbeat_monitor_);
-  heart_beat_monitor_thread_->start();
+  heart_beat_monitor_thread_->Start();
 }
 
 Connection::~Connection() {
   LOG4CXX_AUTO_TRACE(logger_);
-  heart_beat_monitor_thread_->join();
+  heart_beat_monitor_thread_->Stop(threads::Thread::kThreadSoftStop);
   delete heartbeat_monitor_;
   threads::DeleteThread(heart_beat_monitor_thread_);