get valid subscription handle even if cft not supported

Signed-off-by: Chen Lihui <[email protected]>
ros2 · Feb 27, 2023 · 7e6d2c3 · 7e6d2c3
1 parent 1bf9e7a
commit 7e6d2c3
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/rmw_fastrtps_cpp/src/subscription.cpp b/rmw_fastrtps_cpp/src/subscription.cpp
@@ -239,15 +239,13 @@ create_subscription(
       subscription_options->content_filter_options;
     if (nullptr != options->filter_expression) {
       eprosima::fastdds::dds::ContentFilteredTopic * filtered_topic = nullptr;
-      if (!rmw_fastrtps_shared_cpp::create_content_filtered_topic(
+      if (rmw_fastrtps_shared_cpp::create_content_filtered_topic(
           dds_participant, des_topic,
           topic_name_mangled, options, &filtered_topic))
       {
-        RMW_SET_ERROR_MSG("create_contentfilteredtopic() failed to create contentfilteredtopic");
-        return nullptr;
+        info->filtered_topic_ = filtered_topic;
+        des_topic = filtered_topic;
       }
-      info->filtered_topic_ = filtered_topic;
-      des_topic = filtered_topic;
     }
   }