diff --git a/rmw_fastrtps_shared_cpp/src/utils.cpp b/rmw_fastrtps_shared_cpp/src/utils.cpp index a891418ff..9e72e9030 100644 --- a/rmw_fastrtps_shared_cpp/src/utils.cpp +++ b/rmw_fastrtps_shared_cpp/src/utils.cpp @@ -162,7 +162,7 @@ create_datareader( updated_qos, listener, eprosima::fastdds::dds::StatusMask::subscription_matched()); - if (!data_reader && + if (!(*data_reader) && (RMW_UNIQUE_NETWORK_FLOW_ENDPOINTS_OPTIONALLY_REQUIRED == subscription_options->require_unique_network_flow_endpoints)) { @@ -172,6 +172,11 @@ create_datareader( listener, eprosima::fastdds::dds::StatusMask::subscription_matched()); } + + if (!(*data_reader)) { + return false; + } + return true; }