Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[21900] Fix DataReaderHistory regression #5327

Merged
merged 2 commits into from
Oct 16, 2024
Merged

[21900] Fix DataReaderHistory regression #5327

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
682b4df
Refs #21694. Turn assertion into condition.
MiguelCompany Oct 15, 2024
682265b
Refs #21694. Fix uncrustify.
MiguelCompany Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,10 +862,8 @@ bool DataReaderHistory::update_instance_nts(
change->reader_info.no_writers_generation_count = vit->second->no_writers_generation_count;

auto current_owner = vit->second->current_owner.first;
if (current_owner != previous_owner)
if ((current_owner != previous_owner) && (current_owner == change->writerGUID))
{
assert(current_owner == change->writerGUID);

// Remove all changes from different owners after the change.
DataReaderInstance::ChangeCollection& changes = vit->second->cache_changes;
auto it = std::lower_bound(changes.begin(), changes.end(), change, rtps::history_order_cmp);
Expand Down
Loading