From 6a9caae33e60acc95c5ceb252ff73071189c927b Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Mon, 10 Apr 2023 07:17:35 +0200 Subject: [PATCH] Revert changes on rmw_event.cpp Signed-off-by: Miguel Company --- rmw_fastrtps_shared_cpp/src/rmw_event.cpp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/rmw_fastrtps_shared_cpp/src/rmw_event.cpp b/rmw_fastrtps_shared_cpp/src/rmw_event.cpp index 37922e738..0aa43a473 100644 --- a/rmw_fastrtps_shared_cpp/src/rmw_event.cpp +++ b/rmw_fastrtps_shared_cpp/src/rmw_event.cpp @@ -142,18 +142,10 @@ __rmw_init_event( rmw_event->data = data; rmw_event->event_type = event_type; CustomEventInfo * event = static_cast(rmw_event->data); - - // For matched events, we always notify the waitset with the guard condition, - // so we will not enable them on the status condition. - bool is_matched_event = - (RMW_EVENT_PUBLICATION_MATCHED == event_type) || - (RMW_EVENT_SUBSCRIPTION_MATCHED == event_type); - if (!is_matched_event) { - eprosima::fastdds::dds::StatusMask status_mask = - event->get_listener()->get_statuscondition().get_enabled_statuses(); - status_mask |= rmw_fastrtps_shared_cpp::internal::rmw_event_to_dds_statusmask(event_type); - event->get_listener()->get_statuscondition().set_enabled_statuses(status_mask); - } + eprosima::fastdds::dds::StatusMask status_mask = + event->get_listener()->get_statuscondition().get_enabled_statuses(); + status_mask |= rmw_fastrtps_shared_cpp::internal::rmw_event_to_dds_statusmask(event_type); + event->get_listener()->get_statuscondition().set_enabled_statuses(status_mask); return RMW_RET_OK; }