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

Fini even if node context is invalid and reset error (#346)

Browse source
This commit is contained in:
Shane Loretz 2018-11-30 19:45:47 -08:00 • committed by William Woodall
parent fd77323b9d
commit dcaef179b1
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rcl_action/src/rcl_action/action_client.c
View file

@ -199,7 +199,7 @@ rcl_action_client_fini(rcl_action_client_t * action_client, rcl_node_t * node)
if (!rcl_action_client_is_valid(action_client)) { if (!rcl_action_client_is_valid(action_client)) {
return RCL_RET_ACTION_CLIENT_INVALID; // error already set return RCL_RET_ACTION_CLIENT_INVALID; // error already set
} }
if (!rcl_node_is_valid(node)) { if (!rcl_node_is_valid_except_context(node)) {
return RCL_RET_NODE_INVALID; // error already set return RCL_RET_NODE_INVALID; // error already set
} }
rcl_ret_t ret = RCL_RET_OK; rcl_ret_t ret = RCL_RET_OK;
@ -396,22 +396,27 @@ rcl_action_client_is_valid(const rcl_action_client_t * action_client)
RCL_CHECK_FOR_NULL_WITH_MSG( RCL_CHECK_FOR_NULL_WITH_MSG(
action_client->impl, "action client implementation is invalid", return false); action_client->impl, "action client implementation is invalid", return false);
if (!rcl_client_is_valid(&action_client->impl->goal_client)) { if (!rcl_client_is_valid(&action_client->impl->goal_client)) {
rcl_reset_error();
RCL_SET_ERROR_MSG("goal client is invalid"); RCL_SET_ERROR_MSG("goal client is invalid");
return false; return false;
} }
if (!rcl_client_is_valid(&action_client->impl->cancel_client)) { if (!rcl_client_is_valid(&action_client->impl->cancel_client)) {
rcl_reset_error();
RCL_SET_ERROR_MSG("cancel client is invalid"); RCL_SET_ERROR_MSG("cancel client is invalid");
return false; return false;
} }
if (!rcl_client_is_valid(&action_client->impl->result_client)) { if (!rcl_client_is_valid(&action_client->impl->result_client)) {
rcl_reset_error();
RCL_SET_ERROR_MSG("result client is invalid"); RCL_SET_ERROR_MSG("result client is invalid");
return false; return false;
} }
if (!rcl_subscription_is_valid(&action_client->impl->feedback_subscription)) { if (!rcl_subscription_is_valid(&action_client->impl->feedback_subscription)) {
rcl_reset_error();
RCL_SET_ERROR_MSG("feedback subscription is invalid"); RCL_SET_ERROR_MSG("feedback subscription is invalid");
return false; return false;
} }
if (!rcl_subscription_is_valid(&action_client->impl->status_subscription)) { if (!rcl_subscription_is_valid(&action_client->impl->status_subscription)) {
rcl_reset_error();
RCL_SET_ERROR_MSG("status subscription is invalid"); RCL_SET_ERROR_MSG("status subscription is invalid");
return false; return false;
} }

7
rcl_action/src/rcl_action/action_server.c
View file

@ -229,7 +229,7 @@ rcl_ret_t
rcl_action_server_fini(rcl_action_server_t * action_server, rcl_node_t * node) rcl_action_server_fini(rcl_action_server_t * action_server, rcl_node_t * node)
{ {
RCL_CHECK_ARGUMENT_FOR_NULL(action_server, RCL_RET_ACTION_SERVER_INVALID); RCL_CHECK_ARGUMENT_FOR_NULL(action_server, RCL_RET_ACTION_SERVER_INVALID);
if (!rcl_node_is_valid(node)) { if (!rcl_node_is_valid_except_context(node)) {
return RCL_RET_NODE_INVALID; // error already set return RCL_RET_NODE_INVALID; // error already set
} }
@ -894,22 +894,27 @@ rcl_action_server_is_valid(const rcl_action_server_t * action_server)
RCL_CHECK_FOR_NULL_WITH_MSG( RCL_CHECK_FOR_NULL_WITH_MSG(
action_server->impl, "action server implementation is invalid", return false); action_server->impl, "action server implementation is invalid", return false);
if (!rcl_service_is_valid(&action_server->impl->goal_service)) { if (!rcl_service_is_valid(&action_server->impl->goal_service)) {
rcl_reset_error();
RCL_SET_ERROR_MSG("goal service is invalid"); RCL_SET_ERROR_MSG("goal service is invalid");
return false; return false;
} }
if (!rcl_service_is_valid(&action_server->impl->cancel_service)) { if (!rcl_service_is_valid(&action_server->impl->cancel_service)) {
rcl_reset_error();
RCL_SET_ERROR_MSG("cancel service is invalid"); RCL_SET_ERROR_MSG("cancel service is invalid");
return false; return false;
} }
if (!rcl_service_is_valid(&action_server->impl->result_service)) { if (!rcl_service_is_valid(&action_server->impl->result_service)) {
rcl_reset_error();
RCL_SET_ERROR_MSG("result service is invalid"); RCL_SET_ERROR_MSG("result service is invalid");
return false; return false;
} }
if (!rcl_publisher_is_valid(&action_server->impl->feedback_publisher)) { if (!rcl_publisher_is_valid(&action_server->impl->feedback_publisher)) {
rcl_reset_error();
RCL_SET_ERROR_MSG("feedback publisher is invalid"); RCL_SET_ERROR_MSG("feedback publisher is invalid");
return false; return false;
} }
if (!rcl_publisher_is_valid(&action_server->impl->status_publisher)) { if (!rcl_publisher_is_valid(&action_server->impl->status_publisher)) {
rcl_reset_error();
RCL_SET_ERROR_MSG("status publisher is invalid"); RCL_SET_ERROR_MSG("status publisher is invalid");
return false; return false;
} }