fix conflicts due to merge

3 files changed, 6 insertions, 9 deletions

diff --git a/src/components/connection_handler/src/connection.cc b/src/components/connection_handler/src/connection.cc
index 15f97f78e4..b926234b9c 100644
--- a/src/components/connection_handler/src/connection.cc
+++ b/src/components/connection_handler/src/connection.cc
@@ -103,7 +103,7 @@ Connection::~Connection() {
   // associated with this Connection from the SessionConnectionMap.
 
   // NESTED LOCK: make sure to lock session_map_lock_ then ConnectionHandler's
-  // session_connection_map_lock_ (which will be taken in RemoveSession).
+  // session_connection_map_lock_ptr_ (which will be taken in RemoveSession).
   sync_primitives::AutoLock lock(session_map_lock_);
   SessionMap::iterator session_it = session_map_.begin();
   while (session_it != session_map_.end()) {
@@ -128,7 +128,7 @@ uint32_t Connection::AddNewSession(
   // session IDs are globally unique, and not only unique within a Connection.
 
   // NESTED LOCK: make sure to lock session_map_lock_ then ConnectionHandler's
-  // session_connection_map_lock_ (which will be taken in AddSession)
+  // session_connection_map_lock_ptr_ (which will be taken in AddSession)
   sync_primitives::AutoLock lock(session_map_lock_);
 
   const uint32_t session_id =
diff --git a/src/components/connection_handler/src/connection_handler_impl.cc b/src/components/connection_handler/src/connection_handler_impl.cc
index 0de0fc9f96..729f216fc3 100644
--- a/src/components/connection_handler/src/connection_handler_impl.cc
+++ b/src/components/connection_handler/src/connection_handler_impl.cc
@@ -1018,7 +1018,7 @@ uint32_t ConnectionHandlerImpl::AddSession(
     const transport_manager::ConnectionUID primary_transport_id) {
   LOG4CXX_AUTO_TRACE(logger_);
 
-  sync_primitives::AutoLock auto_lock(session_connection_map_lock_);
+  sync_primitives::AutoLock auto_lock(session_connection_map_lock_ptr_);
   const uint32_t session_id = findGap(session_connection_map_);
   if (session_id > 0) {
     LOG4CXX_INFO(logger_,
@@ -1040,7 +1040,7 @@ uint32_t ConnectionHandlerImpl::AddSession(
 bool ConnectionHandlerImpl::RemoveSession(uint8_t session_id) {
   LOG4CXX_AUTO_TRACE(logger_);
 
-  sync_primitives::AutoLock auto_lock(session_connection_map_lock_);
+  sync_primitives::AutoLock auto_lock(session_connection_map_lock_ptr_);
   SessionConnectionMap::iterator itr = session_connection_map_.find(session_id);
   if (session_connection_map_.end() == itr) {
     LOG4CXX_WARN(logger_, "Session not found in Session/Connection Map!");
@@ -1065,7 +1065,7 @@ SessionTransports ConnectionHandlerImpl::SetSecondaryTransportID(
     transport_manager::ConnectionUID secondary_transport_id) {
   SessionTransports st;
 
-  sync_primitives::AutoLock auto_lock(session_connection_map_lock_);
+  sync_primitives::AutoLock auto_lock(session_connection_map_lock_ptr_);
   SessionConnectionMap::iterator it = session_connection_map_.find(session_id);
   if (session_connection_map_.end() == it) {
     LOG4CXX_WARN(logger_,
diff --git a/src/components/connection_handler/test/heart_beat_monitor_test.cc b/src/components/connection_handler/test/heart_beat_monitor_test.cc
index 7fc835c8b6..e089a07ec4 100644
--- a/src/components/connection_handler/test/heart_beat_monitor_test.cc
+++ b/src/components/connection_handler/test/heart_beat_monitor_test.cc
@@ -55,10 +55,7 @@ using ::testing::Return;
 
 class HeartBeatMonitorTest : public testing::Test {
  public:
-  HeartBeatMonitorTest()
-      : conn(NULL)
-      , session_connection_map_lock_ptr_(
-            std::make_shared<sync_primitives::Lock>()) {
+  HeartBeatMonitorTest() : conn(NULL) {
     kTimeout = 5000u;
   }