Skip to content

Commit 084d969

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 a8396fa commit 084d969

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -867,10 +867,8 @@ bool DataReaderHistory::update_instance_nts(
867867
change->reader_info.no_writers_generation_count = vit->second->no_writers_generation_count;
868868

869869
auto current_owner = vit->second->current_owner.first;
870-
if (current_owner != previous_owner)
870+
if ((current_owner != previous_owner) && (current_owner == change->writerGUID))
871871
{
872-
assert(current_owner == change->writerGUID);
873-
874872
// Remove all changes from different owners after the change.
875873
DataReaderInstance::ChangeCollection& changes = vit->second->cache_changes;
876874
auto it = std::lower_bound(changes.begin(), changes.end(), change, rtps::history_order_cmp);

0 commit comments

Comments
 (0)