niklas/rclcpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix error reporting for services

Browse source
This commit is contained in:
Dirk Thomas 2016-11-10 11:13:19 -08:00
parent 4c876d5966
commit d12154b1f9
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rclcpp/src/rclcpp/executor.cpp
View file

@ -291,11 +291,9 @@ Executor::execute_service(
service->get_service_handle(), service->get_service_handle(),
request_header.get(), request_header.get(),
request.get()); request.get());
if (status != RCL_RET_SERVICE_TAKE_FAILED) {
if (status == RCL_RET_OK) { if (status == RCL_RET_OK) {
service->handle_request(request_header, request); service->handle_request(request_header, request);
} } else if (status != RCL_RET_SERVICE_TAKE_FAILED) {
} else {
fprintf(stderr, fprintf(stderr,
"[rclcpp::error] take request failed for server of service '%s': %s\n", "[rclcpp::error] take request failed for server of service '%s': %s\n",
service->get_service_name().c_str(), rcl_get_error_string_safe()); service->get_service_name().c_str(), rcl_get_error_string_safe());
@ -312,11 +310,9 @@ Executor::execute_client(
client->get_client_handle(), client->get_client_handle(),
request_header.get(), request_header.get(),
response.get()); response.get());
if (status != RCL_RET_SERVICE_TAKE_FAILED) {
if (status == RCL_RET_OK) { if (status == RCL_RET_OK) {
client->handle_response(request_header, response); client->handle_response(request_header, response);
} } else if (status != RCL_RET_SERVICE_TAKE_FAILED) {
} else {
fprintf(stderr, fprintf(stderr,
"[rclcpp::error] take response failed for client of service '%s': %s\n", "[rclcpp::error] take response failed for client of service '%s': %s\n",
client->get_service_name().c_str(), rcl_get_error_string_safe()); client->get_service_name().c_str(), rcl_get_error_string_safe());