From c65c015682f103c74cbca24c158908e844b75bb4 Mon Sep 17 00:00:00 2001 From: Michel Hidalgo Date: Tue, 22 Sep 2020 10:11:58 -0300 Subject: [PATCH] Check for message_info on take where appropriate. (#245) Fix for regression introduced in #241. Signed-off-by: Michel Hidalgo --- rmw_cyclonedds_cpp/src/rmw_node.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/rmw_cyclonedds_cpp/src/rmw_node.cpp b/rmw_cyclonedds_cpp/src/rmw_node.cpp index ac2d5af5..2a2f46df 100644 --- a/rmw_cyclonedds_cpp/src/rmw_node.cpp +++ b/rmw_cyclonedds_cpp/src/rmw_node.cpp @@ -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, @@ -2724,6 +2721,7 @@ extern "C" rmw_ret_t rmw_take_with_info( rmw_subscription_allocation_t * allocation) { static_cast(allocation); + RMW_CHECK_ARGUMENT_FOR_NULL(message_info, RMW_RET_INVALID_ARGUMENT); return rmw_take_int(subscription, ros_message, taken, message_info); }