diff --git a/rclcpp_action/src/client.cpp b/rclcpp_action/src/client.cpp index e0e47bc..bc21dfa 100644 --- a/rclcpp_action/src/client.cpp +++ b/rclcpp_action/src/client.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include "rclcpp_action/client.hpp" #include "rclcpp_action/exceptions.hpp" @@ -314,14 +315,18 @@ ClientBase::handle_result_response( const rmw_request_id_t & response_header, std::shared_ptr response) { - std::lock_guard guard(pimpl_->result_requests_mutex); - const int64_t & sequence_number = response_header.sequence_number; - if (pimpl_->pending_result_responses.count(sequence_number) == 0) { - RCLCPP_ERROR(pimpl_->logger, "unknown result response, ignoring..."); - return; + ResponseCallback response_callback; + { + std::lock_guard guard(pimpl_->result_requests_mutex); + const int64_t & sequence_number = response_header.sequence_number; + if (pimpl_->pending_result_responses.count(sequence_number) == 0) { + RCLCPP_ERROR(pimpl_->logger, "unknown result response, ignoring..."); + return; + } + response_callback = std::move(pimpl_->pending_result_responses[sequence_number]); + pimpl_->pending_result_responses.erase(sequence_number); } - pimpl_->pending_result_responses[sequence_number](response); - pimpl_->pending_result_responses.erase(sequence_number); + response_callback(response); } void