Skip to content

Commit

Permalink
Check for message_info on take where appropriate. (#245)
Browse files Browse the repository at this point in the history
Fix for regression introduced in #241.

Signed-off-by: Michel Hidalgo <michel@ekumenlabs.com>
  • Loading branch information
hidmic authored and ahcorde committed Oct 15, 2020
1 parent 4682af4 commit c65c015
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions rmw_cyclonedds_cpp/src/rmw_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2524,9 +2524,6 @@ static rmw_ret_t rmw_take_int(
RMW_CHECK_ARGUMENT_FOR_NULL(
subscription, RMW_RET_INVALID_ARGUMENT);

RMW_CHECK_ARGUMENT_FOR_NULL(
message_info, RMW_RET_INVALID_ARGUMENT);

RMW_CHECK_TYPE_IDENTIFIERS_MATCH(
subscription handle,
subscription->implementation_identifier, eclipse_cyclonedds_identifier,
Expand Down Expand Up @@ -2724,6 +2721,7 @@ extern "C" rmw_ret_t rmw_take_with_info(
rmw_subscription_allocation_t * allocation)
{
static_cast<void>(allocation);
RMW_CHECK_ARGUMENT_FOR_NULL(message_info, RMW_RET_INVALID_ARGUMENT);
return rmw_take_int(subscription, ros_message, taken, message_info);
}

Expand Down

0 comments on commit c65c015

Please sign in to comment.