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

fix abort in some cases with DDS #13627

Open
wants to merge 3 commits into
base: development
Choose a base branch
from
Open

fix abort in some cases with DDS #13627

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5e1c7c
fix abort in some cases with DDS
AviaAv Dec 24, 2024
83a7d6e
adding the error message to log
AviaAv Dec 25, 2024
ec36486
update log error message
AviaAv Dec 26, 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
11 changes: 9 additions & 2 deletions third-party/realdds/src/dds-network-adapter-watcher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,15 @@ class network_adapter_watcher_singleton
~network_adapter_watcher_singleton()
{
_adapter_watcher.reset(); // signal the thread to finish
if( _th.joinable() )
_th.join();
try
{
if (_th.joinable())
_th.join();
}
catch (std::system_error& e)
{
LOG_ERROR("Network adapter watcher termination failed: " << e.what());
}
}

void update_ips( ip_set * p_new_ips = nullptr, ip_set * p_old_ips = nullptr )
Expand Down
Loading