From 6c22f6708690822aef14edff17af01518e671cd0 Mon Sep 17 00:00:00 2001
From: Xiaojing Cao <xjzer2020@163.com>
Date: Fri, 6 Dec 2024 18:26:10 +0800
Subject: [PATCH] Fix the double-locking issue when spurious wakeup occurs in
 wait function.

Signed-off-by: Xiaojing Cao <xiaojing.cao@hirain.com>
---
 src/cpp/rtps/DataSharing/DataSharingListener.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/cpp/rtps/DataSharing/DataSharingListener.cpp b/src/cpp/rtps/DataSharing/DataSharingListener.cpp
index ce1693f50eb..294e78bbc91 100644
--- a/src/cpp/rtps/DataSharing/DataSharingListener.cpp
+++ b/src/cpp/rtps/DataSharing/DataSharingListener.cpp
@@ -56,18 +56,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*/)
         {