Fix memory bug

Signed-off-by: Raül <raulojeda@eprosima.com>

Author: raulojeda22

src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.cpp

@@ -803,12 +803,12 @@ void DiscoveryDataBase::update_participant_from_change_(
         update_change_and_unmatch_(ch, participant_info);
 
         // If it is local and server we have to create virtual endpoints, except for our own server
-        if (change_guid.guidPrefix != server_guid_prefix_ && change_data.is_local())
+        if (change_guid.guidPrefix != server_guid_prefix_ && !change_data.is_client() && change_data.is_local())
         {
             // Match new server and create virtual endpoints
             // NOTE: match after having updated the change, so virtual endpoints are not discarded for having
             // an associated unalive participant
-            match_new_server_(change_guid.guidPrefix, change_data.is_client() || change_data.is_superclient());
+            match_new_server_(change_guid.guidPrefix, change_data.is_superclient());
         }
 
         // Treat as a new participant found
@@ -832,8 +832,13 @@ void DiscoveryDataBase::update_participant_from_change_(
         // Update change
         update_change_and_unmatch_(ch, participant_info);
 
-        // NOTE: match after having updated the change in order to send the new Data(P)
-        match_new_server_(change_guid.guidPrefix, change_data.is_client() || change_data.is_superclient());
+        // If the participant changes to server local, virtual endpoints must be added
+        // If it is local and server the only possibility is it was a remote server and it must be converted to local
+        if (!change_data.is_client())
+        {
+            // NOTE: match after having updated the change in order to send the new Data(P)
+            match_new_server_(change_guid.guidPrefix, change_data.is_superclient());
+        }
 
         // Treat as a new participant found
         new_updates_++;

test/blackbox/common/BlackboxTestsDiscovery.cpp

@@ -2380,8 +2380,8 @@ TEST_P(Discovery, discovery_server_edp_messages_sent)
     // Ensure that no additional Data(r/w) messages are sent by DS routine
     std::this_thread::sleep_for(std::chrono::seconds(15));
 
-    EXPECT_EQ(num_data_r_w_sends_s1.load(std::memory_order::memory_order_seq_cst), 3u);
-    EXPECT_EQ(num_data_r_w_sends_s2.load(std::memory_order::memory_order_seq_cst), 3u);
+    EXPECT_EQ(num_data_r_w_sends_s1.load(std::memory_order::memory_order_seq_cst), 2u);
+    EXPECT_EQ(num_data_r_w_sends_s2.load(std::memory_order::memory_order_seq_cst), 2u);
 }
 
 // This is a regression test for Redmine #23088, which corrects the following data race in the discovery server: