Refs #22648: solved conflicts

Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com>
eProsima · Jan 30, 2025 · b170f7b · b170f7b
1 parent d6af9e6
commit b170f7b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/cpp/rtps/writer/StatefulWriter.cpp b/src/cpp/rtps/writer/StatefulWriter.cpp
@@ -1521,6 +1521,8 @@ void StatefulWriter::check_acked_status()
 
         if (min_low_mark >= get_seq_num_min())
         {
+            // get_seq_num_min() returns SequenceNumber_t::unknown() when the history is empty.
+            // Thus, it is set to 2 to indicate that all samples have been removed.
             may_remove_change_ = (get_seq_num_min() == SequenceNumber_t::unknown()) ? 2 : 1;
         }
 

diff --git a/test/blackbox/api/dds-pim/PubSubWriter.hpp b/test/blackbox/api/dds-pim/PubSubWriter.hpp
@@ -882,7 +882,6 @@ class PubSubWriter
     {
         datawriter_qos_.reliability().kind = kind;
         datawriter_qos_.reliability().max_blocking_time = max_blocking_time;
-
         return *this;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -882,7 +882,6 @@ class PubSubWriter @@
         {
             datawriter_qos_.reliability().kind = kind;
             datawriter_qos_.reliability().max_blocking_time = max_blocking_time;
             return *this;
         }
@@ Expand Down @@