Removed topics_list_

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
eProsima · Mar 9, 2021 · dc80c49 · dc80c49
1 parent e350125
commit dc80c49
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_participant_info.hpp b/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_participant_info.hpp
@@ -58,9 +58,7 @@ typedef struct CustomParticipantInfo
   eprosima::fastdds::dds::Publisher * publisher_{nullptr};
   eprosima::fastdds::dds::Subscriber * subscriber_{nullptr};
 
-  // Struct to store every topic created in the local domain
-  // These variables needs to be
-  mutable std::vector<eprosima::fastdds::dds::Topic *> topics_list_;
+  // Protects creation and destruction of topics, readers and writers
   mutable std::mutex entity_creation_mutex_;
 
   // Flag to establish if the QoS of the participant,

diff --git a/rmw_fastrtps_shared_cpp/src/participant.cpp b/rmw_fastrtps_shared_cpp/src/participant.cpp
@@ -343,15 +343,6 @@ rmw_fastrtps_shared_cpp::destroy_participant(CustomParticipantInfo * participant
     return RMW_RET_ERROR;
   }
 
-  // Topics must be deleted before delete the participant
-  for (auto topic : participant_info->topics_list_) {
-    ReturnCode_t ret = participant_info->participant_->delete_topic(topic);
-    if (ret != ReturnCode_t::RETCODE_OK) {
-      RMW_SET_ERROR_MSG("Fail in delete participant");
-      return rmw_fastrtps_shared_cpp::cast_error_dds_to_rmw(ret);
-    }
-  }
-
   // Remove publisher and subcriber from participant
   ReturnCode_t ret = participant_info->participant_->delete_publisher(participant_info->publisher_);
   if (ret != ReturnCode_t::RETCODE_OK) {