Refs #20706: Apply review suggestions

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
eProsima · Apr 18, 2024 · cf9078c · cf9078c
1 parent 51abaa7
commit cf9078c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp b/src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp
@@ -358,12 +358,13 @@ bool DataReaderHistory::get_first_untaken_info(
         auto& instance_changes = it.second->cache_changes;
         for (auto& instance_change : instance_changes)
         {
-            WriterProxy* wp;
+            WriterProxy* wp = nullptr;
             bool is_future_change = false;
 
+            if (mp_reader->begin_sample_access_nts(instance_change, wp, is_future_change))
             {
-                std::lock_guard<RecursiveTimedMutex> _(mp_reader->getMutex());
-                if (mp_reader->begin_sample_access_nts(instance_change, wp, is_future_change) && is_future_change)
+                mp_reader->end_sample_access_nts(instance_change, wp, false);
+                if (is_future_change)
                 {
                     continue;
                 }