Fix errors from merge conflictsfix/fix_session_heartbeat_starting

4 files changed, 6 insertions, 6 deletions

diff --git a/src/components/connection_handler/include/connection_handler/heartbeat_monitor.h b/src/components/connection_handler/include/connection_handler/heartbeat_monitor.h
index 80c20b832e..7713d2490f 100644
--- a/src/components/connection_handler/include/connection_handler/heartbeat_monitor.h
+++ b/src/components/connection_handler/include/connection_handler/heartbeat_monitor.h
@@ -119,7 +119,7 @@ class HeartBeatMonitor : public threads::ThreadDelegate {
   typedef std::map<uint8_t, SessionState> SessionMap;
   SessionMap sessions_;
 
-  sync_primitives::RecursiveLock sessions_list_lock_;  // recursive
+  mutable sync_primitives::RecursiveLock sessions_list_lock_;  // recursive
   sync_primitives::Lock main_thread_lock_;
   mutable sync_primitives::Lock heartbeat_timeout_seconds_lock_;
   sync_primitives::ConditionalVariable heartbeat_monitor_;
diff --git a/src/components/connection_handler/src/connection_handler_impl.cc b/src/components/connection_handler/src/connection_handler_impl.cc
index 70fd3f96a7..a771f0a104 100644
--- a/src/components/connection_handler/src/connection_handler_impl.cc
+++ b/src/components/connection_handler/src/connection_handler_impl.cc
@@ -1669,7 +1669,7 @@ void ConnectionHandlerImpl::SendEndService(uint32_t key, uint8_t service_type) {
 
 bool ConnectionHandlerImpl::IsSessionHeartbeatTracked(
     const uint32_t connection_key) const {
-  LOG4CXX_AUTO_TRACE(logger_);
+  SDL_LOG_AUTO_TRACE();
   uint32_t connection_handle = 0;
   uint8_t session_id = 0;
   PairFromKey(connection_key, &connection_handle, &session_id);
diff --git a/src/components/connection_handler/src/heartbeat_monitor.cc b/src/components/connection_handler/src/heartbeat_monitor.cc
index e3b0e39654..be50e6c802 100644
--- a/src/components/connection_handler/src/heartbeat_monitor.cc
+++ b/src/components/connection_handler/src/heartbeat_monitor.cc
@@ -88,7 +88,7 @@ void HeartBeatMonitor::threadMain() {
 
 void HeartBeatMonitor::AddSession(uint8_t session_id) {
   if (0 == default_heartbeat_timeout_) {
-    SDL_LOG_INFO(logger_,
+    SDL_LOG_INFO(
                  "Won't add session with id "
                      << static_cast<uint32_t>(session_id)
                      << " because Heartbeat is disabled.");
@@ -136,7 +136,7 @@ void HeartBeatMonitor::KeepAlive(uint8_t session_id) {
 
 bool HeartBeatMonitor::IsSessionHeartbeatTracked(
     const uint8_t session_id) const {
-  LOG4CXX_AUTO_TRACE(logger_);
+  SDL_LOG_AUTO_TRACE();
   AutoLock auto_lock(sessions_list_lock_);
 
   return sessions_.end() != sessions_.find(session_id);
diff --git a/src/components/protocol_handler/src/protocol_handler_impl.cc b/src/components/protocol_handler/src/protocol_handler_impl.cc
index 2d963bd997..d0505a42a3 100644
--- a/src/components/protocol_handler/src/protocol_handler_impl.cc
+++ b/src/components/protocol_handler/src/protocol_handler_impl.cc
@@ -2057,7 +2057,7 @@ RESULT_CODE ProtocolHandlerImpl::HandleControlMessageHeartBeat(
     const ProtocolPacket& packet) {
   const ConnectionID connection_id = packet.connection_id();
   const uint32_t session_id = packet.session_id();
-  SDL_LOG_DEBUG(logger_,
+  SDL_LOG_DEBUG(
                 "Sending heart beat acknowledgment for connection "
                     << connection_id << " session " << session_id);
   uint8_t protocol_version;
@@ -2069,7 +2069,7 @@ RESULT_CODE ProtocolHandlerImpl::HandleControlMessageHeartBeat(
       const uint32_t connection_key =
           session_observer_.KeyFromPair(connection_id, session_id);
       if (!connection_handler_.IsSessionHeartbeatTracked(connection_key)) {
-        LOG4CXX_DEBUG(logger_,
+        SDL_LOG_DEBUG(
                       "Session heartbeat tracking is not started. "
                           << "Starting it for session " << session_id);
         connection_handler_.StartSessionHeartBeat(connection_key);