[21355] Make on_xxx_matched thread-safe (backport #6371)

src/cpp/fastdds/publisher/DataWriterImpl.cpp

@@ -1286,6 +1286,8 @@ void DataWriterImpl::InnerDataWriterListener::onWriterMatched(
         RTPSWriter* /*writer*/,
         const PublicationMatchedStatus& info)
 {
+    std::lock_guard<std::mutex> scoped_lock(matching_info_mutex_);
+
     data_writer_->update_publication_matched_status(info);
 
     StatusMask notify_status = StatusMask::publication_matched();

src/cpp/fastdds/publisher/DataWriterImpl.hpp

@@ -459,11 +459,11 @@ class DataWriterImpl : protected rtps::IReaderDataFilter
                 const uint32_t& status_id);
 #endif //FASTDDS_STATISTICS
 
-        DataWriterImpl* data_writer_;
-
     private:
 
         using fastrtps::rtps::WriterListener::onWriterMatched;
+        std::mutex matching_info_mutex_;
+        DataWriterImpl* data_writer_;
     }
     writer_listener_;
 

src/cpp/fastdds/subscriber/DataReaderImpl.cpp

@@ -941,6 +941,8 @@ void DataReaderImpl::InnerDataReaderListener::onReaderMatched(
         RTPSReader* /*reader*/,
         const SubscriptionMatchedStatus& info)
 {
+    std::lock_guard<std::mutex> scoped_lock(matching_info_mutex_);
+
     data_reader_->update_subscription_matched_status(info);
 
     StatusMask notify_status = StatusMask::subscription_matched();

src/cpp/fastdds/subscriber/DataReaderImpl.hpp

@@ -448,7 +448,10 @@ class DataReaderImpl
                 const uint32_t& status_id);
 #endif //FASTDDS_STATISTICS
 
+    private:
+
         DataReaderImpl* data_reader_;
+        std::mutex matching_info_mutex_;
 
     private: