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.

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(ndt_scan_matcher): avoid passing nullptr in ndt #6620

Merged
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions localization/ndt_scan_matcher/src/map_update_module.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ void MapUpdateModule::update_map(const geometry_msgs::msg::Point & position)
ndt_ptr_mutex_->unlock();
return;
}
ndt_ptr_->setInputSource(input_source);
if (input_source != nullptr) {
ndt_ptr_->setInputSource(input_source);
}
ndt_ptr_mutex_->unlock();
need_rebuild_ = false;
} else {
Expand All @@ -107,7 +109,9 @@ void MapUpdateModule::update_map(const geometry_msgs::msg::Point & position)
auto dummy_ptr = ndt_ptr_;
auto input_source = ndt_ptr_->getInputSource();
ndt_ptr_ = secondary_ndt_ptr_;
ndt_ptr_->setInputSource(input_source);
if (input_source != nullptr) {
ndt_ptr_->setInputSource(input_source);
}
ndt_ptr_mutex_->unlock();

dummy_ptr.reset();
Expand Down
Loading