Skip to content

Commit 327113a

Browse files
MiguelCompanymergify[bot]
authored andcommitted
Fix DataReaderHistory regression (#5327)
* Refs #21694. Turn assertion into condition. Signed-off-by: Miguel Company <[email protected]> * Refs #21694. Fix uncrustify. Signed-off-by: Miguel Company <[email protected]> --------- Signed-off-by: Miguel Company <[email protected]> (cherry picked from commit 837c6c8)
1 parent 5c68fcf commit 327113a

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -839,10 +839,8 @@ bool DataReaderHistory::update_instance_nts(
839839
change->reader_info.no_writers_generation_count = vit->second->no_writers_generation_count;
840840

841841
auto current_owner = vit->second->current_owner.first;
842-
if (current_owner != previous_owner)
842+
if ((current_owner != previous_owner) && (current_owner == change->writerGUID))
843843
{
844-
assert(current_owner == change->writerGUID);
845-
846844
// Remove all changes from different owners after the change.
847845
DataReaderInstance::ChangeCollection& changes = vit->second->cache_changes;
848846
auto it = std::lower_bound(changes.begin(), changes.end(), change, rtps::history_order_cmp);

0 commit comments

Comments
 (0)