Refs #21054: Apply Miguel suggestion

Signed-off-by: Mario Dominguez <[email protected]>
eProsima · Jun 7, 2024 · 1c35ef6 · 1c35ef6
1 parent 0b5b994
commit 1c35ef6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/include/fastrtps/xmlparser/XMLParser.h b/include/fastrtps/xmlparser/XMLParser.h
@@ -718,7 +718,7 @@ class XMLParser
 private:
 
     static std::mutex collections_mtx_;
-    static std::vector<std::string> flow_controller_descriptor_names_;
+    static std::set<std::string> flow_controller_descriptor_names_;
 };
 
 } // namespace xmlparser

diff --git a/src/cpp/rtps/xmlparser/XMLElementParser.cpp b/src/cpp/rtps/xmlparser/XMLElementParser.cpp
@@ -137,7 +137,7 @@ namespace fastrtps {
 namespace xmlparser {
 
 std::mutex XMLParser::collections_mtx_;
-std::vector<std::string> XMLParser::flow_controller_descriptor_names_;
+std::set<std::string> XMLParser::flow_controller_descriptor_names_;
 
 using namespace eprosima::fastrtps::rtps;
 using namespace eprosima::fastdds::xml::detail;
@@ -1058,13 +1058,14 @@ XMLP_ret XMLParser::getXMLFlowControllerDescriptorList(
             {
                 std::lock_guard<std::mutex> lock(collections_mtx_);
                 // name - stringType
-                flow_controller_descriptor_names_.emplace_back(get_element_text(p_aux1));
-                flow_controller_descriptor->name = flow_controller_descriptor_names_.back().c_str();
-                if (flow_controller_descriptor_names_.back().empty())
+                auto element_inserted = flow_controller_descriptor_names_.insert(get_element_text(p_aux1));
+                if (element_inserted.first == flow_controller_descriptor_names_.end() ||
+                        element_inserted.first->empty())
                 {
-                    EPROSIMA_LOG_ERROR(XMLPARSER, "<" << p_aux1->Value() << "> getXMLString XML_ERROR!");
+                    EPROSIMA_LOG_ERROR(XMLPARSER, "Node flow controller node '" << NAME << "' invalid");
                     return XMLP_ret::XML_ERROR;
                 }
+                flow_controller_descriptor->name = element_inserted.first->c_str();
                 name_defined = true;
             }
             else if (strcmp(name, SCHEDULER) == 0)
@@ -2845,13 +2846,14 @@ XMLP_ret XMLParser::getXMLPublishModeQos(
         else if (strcmp(name, FLOW_CONTROLLER_NAME) == 0)
         {
             std::lock_guard<std::mutex> lock(collections_mtx_);
-            flow_controller_descriptor_names_.emplace_back(get_element_text(p_aux0));
-            publishMode.flow_controller_name = flow_controller_descriptor_names_.back().c_str();
-            if (flow_controller_descriptor_names_.back().empty())
+            auto element_inserted = flow_controller_descriptor_names_.insert(get_element_text(p_aux0));
+            if (element_inserted.first == flow_controller_descriptor_names_.end() ||
+                    element_inserted.first->empty())
             {
-                EPROSIMA_LOG_ERROR(XMLPARSER, "Node '" << FLOW_CONTROLLER_NAME << "' without content");
+                EPROSIMA_LOG_ERROR(XMLPARSER, "Node '" << FLOW_CONTROLLER_NAME << "' invalid");
                 return XMLP_ret::XML_ERROR;
             }
+            publishMode.flow_controller_name = element_inserted.first->c_str();
         }
         else
         {