Skip to content

Fix error when loading participant info from static discovery xml file #5913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
richiware wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix error when loading participant info from static discovery xml file #5913

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf70c4f
Refs #14474. Fix error.
richiware May 11, 2022
d022c6b
Refs #16279. Fix not able to use same userID in differnt participants
richiware Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/cpp/xmlparser/XMLEndpointParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ void XMLEndpointParser::loadXMLParticipantEndpoint(
{
tinyxml2::XMLNode* xml_RTPSParticipant_child = xml_endpoint;
tinyxml2::XMLElement* element = xml_RTPSParticipant_child->FirstChildElement();
m_endpointIds.clear();
m_entityIds.clear();

while (element != nullptr)
{
Expand Down Expand Up @@ -793,10 +795,11 @@ XMLP_ret XMLEndpointParser::lookforReader(
ReaderProxyData** rdataptr,
uint32_t& position)
{
std::string participant_name(partname);
for (std::vector<StaticRTPSParticipantInfo*>::iterator pit = m_RTPSParticipants.begin();
pit != m_RTPSParticipants.end(); ++pit)
{
if ((*pit)->m_RTPSParticipantName == partname || true) //it doenst matter the name fo the RTPSParticipant, only for organizational purposes
if ((*pit)->m_RTPSParticipantName == participant_name.substr(0, participant_name.find_first_of('#')))
{
position = 0;
for (std::vector<ReaderProxyData*>::iterator rit = (*pit)->m_readers.begin();
Expand Down Expand Up @@ -824,10 +827,11 @@ XMLP_ret XMLEndpointParser::lookforWriter(
WriterProxyData** wdataptr,
uint32_t& position)
{
std::string participant_name(partname);
for (std::vector<StaticRTPSParticipantInfo*>::iterator pit = m_RTPSParticipants.begin();
pit != m_RTPSParticipants.end(); ++pit)
{
if ((*pit)->m_RTPSParticipantName == partname || true) //it doenst matter the name fo the RTPSParticipant, only for organizational purposes
if ((*pit)->m_RTPSParticipantName == participant_name.substr(0, participant_name.find_first_of('#')))
{
position = 0;
for (std::vector<WriterProxyData*>::iterator wit = (*pit)->m_writers.begin();
Expand Down