Correct iterator increment after erasing elements in `connected_serve…

…rs_list` (#5226)

* BugFix: Correct iterator increment after erasing elements in connected_servers_ list

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Refs #21649. Apply suggested changes

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

---------

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>
(cherry picked from commit d4d8e54)

# Conflicts:
#	src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp

src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp

@@ -590,15 +590,25 @@ void PDPClient::removeRemoteEndpoints(
  eprosima::shared_lock<eprosima::shared_mutex> disc_lock(mp_builtin->getDiscoveryMutex());
 
  // Verify if this participant is a server
+<<<<<<< HEAD
  for (auto& svr : mp_builtin->m_DiscoveryServers)
+=======
+ auto it = connected_servers_.begin();
+ while (it != connected_servers_.end())
+>>>>>>> d4d8e5489 (Correct iterator increment after erasing elements in `connected_servers_list` (#5226))
  {
  if (svr.guidPrefix == pdata->m_guid.guidPrefix)
  {
  std::unique_lock<std::recursive_mutex> lock(*getMutex());
  svr.is_connected = false;
  is_server = true;
  mp_sync->restart_timer(); // enable announcement and sync mechanism till this server reappears
+
+ // Avoid incrementing iterator after item removal
+ continue;
  }
+
+ ++it;
  }
  }