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

[18259] Calling old on_participant_discovery overload #3479

Merged
merged 3 commits into from
Jun 22, 2023
Merged

[18259] Calling old on_participant_discovery overload #3479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60a2701
Refs #18257. Notify old overload when participant is not ignored.
MiguelCompany Apr 21, 2023
7ad49fb
Refs #18257. Change default implementation of new overload.
MiguelCompany Apr 21, 2023
b7b60ae
Refs #18259: update versions.md
JLBuenoLopez Jun 20, 2023
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
3 changes: 2 additions & 1 deletion include/fastdds/dds/domain/DomainParticipantListener.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ class DomainParticipantListener :
fastrtps::rtps::ParticipantDiscoveryInfo&& info,
bool& should_be_ignored)
{
on_participant_discovery(participant, std::move(info));
static_cast<void>(participant);
static_cast<void>(info);
should_be_ignored = false;
}

Expand Down
5 changes: 5 additions & 0 deletions src/cpp/fastdds/domain/DomainParticipantImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1554,11 +1554,16 @@ void DomainParticipantImpl::MyRTPSParticipantListener::onParticipantDiscovery(
ParticipantDiscoveryInfo&& info,
bool& should_be_ignored)
{
should_be_ignored = false;
Sentry sentinel(this);
if (sentinel)
{
participant_->listener_->on_participant_discovery(participant_->participant_, std::move(info),
should_be_ignored);
if (!should_be_ignored)
{
participant_->listener_->on_participant_discovery(participant_->participant_, std::move(info));
}
}
}

Expand Down
1 change: 1 addition & 0 deletions versions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Forthcoming
Please, use `BUILD_SHARED_LIBS=OFF` instead.
* Fixed exported symbols on ContentFilteredTopic (ABI break)
* Deprecated the DDS:Crypto:AES-GCM-GMAC plugin configuration through the DomainParticipant PropertyPolicyQos (security vulnerability).
* `DomainParticipantListener::on_participant_discovery` changed behavior (fix API break in 2.10.0).

Version 2.10.1
--------------
Expand Down