Skip to content

Commit eb11591

Browse files
fujitatomoyaAlberto Soragna
authored andcommitted
extract the result response before the callback is issued. (ros2#2132)
Signed-off-by: Tomoya Fujita <[email protected]>
1 parent 0a48816 commit eb11591

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

rclcpp_action/src/client.cpp

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -319,14 +319,19 @@ ClientBase::handle_result_response(
319319
const rmw_request_id_t & response_header,
320320
std::shared_ptr<void> response)
321321
{
322-
std::lock_guard<std::mutex> guard(pimpl_->result_requests_mutex);
323-
const int64_t & sequence_number = response_header.sequence_number;
324-
if (pimpl_->pending_result_responses.count(sequence_number) == 0) {
325-
RCLCPP_ERROR(pimpl_->logger, "unknown result response, ignoring...");
326-
return;
322+
std::map<int64_t, ResponseCallback>::node_type pending_result_response;
323+
{
324+
std::lock_guard<std::mutex> guard(pimpl_->result_requests_mutex);
325+
const int64_t & sequence_number = response_header.sequence_number;
326+
if (pimpl_->pending_result_responses.count(sequence_number) == 0) {
327+
RCLCPP_ERROR(pimpl_->logger, "unknown result response, ignoring...");
328+
return;
329+
}
330+
pending_result_response =
331+
pimpl_->pending_result_responses.extract(sequence_number);
327332
}
328-
pimpl_->pending_result_responses[sequence_number](response);
329-
pimpl_->pending_result_responses.erase(sequence_number);
333+
auto & response_callback = pending_result_response.mapped();
334+
response_callback(response);
330335
}
331336

332337
void

0 commit comments

Comments
 (0)