Fix double-locking issue in DataSharingListener (#5468) (#5522)

Signed-off-by: Xiaojing Cao <[email protected]> (cherry picked from commit 059457a) Co-authored-by: xjzer <[email protected]>
eProsima · Dec 30, 2024 · 3b0c821 · 3b0c821
1 parent 29ff526
commit 3b0c821
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/cpp/rtps/DataSharing/DataSharingListener.cpp b/src/cpp/rtps/DataSharing/DataSharingListener.cpp
@@ -53,18 +53,15 @@ DataSharingListener::~DataSharingListener()
 
 void DataSharingListener::run()
 {
-    std::unique_lock<Segment::mutex> lock(notification_->notification_->notification_mutex, std::defer_lock);
     while (is_running_.load())
     {
         try
         {
-            lock.lock();
+            std::unique_lock<Segment::mutex> lock(notification_->notification_->notification_mutex);
             notification_->notification_->notification_cv.wait(lock, [&]
                     {
                         return !is_running_.load() || notification_->notification_->new_data.load();
                     });
-
-            lock.unlock();
         }
         catch (const boost::interprocess::interprocess_exception& /*e*/)
         {