Ensure multiple listeners for the same factory PID are honoured by `C…

…onfigurationNotifier::AnyListenersForPid` (#865) * Ensure multiple listeners for the same PID are honoured Signed-off-by: Conor Burgess <Burgess.Conor@gmail.com> * Fix formatting Signed-off-by: Conor Burgess <Burgess.Conor@gmail.com> --------- Signed-off-by: Conor Burgess <Burgess.Conor@gmail.com> Co-authored-by: cburgess <cburgess@mathworks.com>
CppMicroServices · Jun 1, 2023 · 1c8f3b0 · 1c8f3b0 · github-actions · Jun 1, 2023
1 parent 6185cb4
commit 1c8f3b0
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/compendium/DeclarativeServices/src/manager/ConfigurationNotifier.cpp b/compendium/DeclarativeServices/src/manager/ConfigurationNotifier.cpp
@@ -116,7 +116,7 @@ namespace cppmicroservices
         ConfigurationNotifier::AnyListenersForPid(std::string const& pid) noexcept
         {
             std::string factoryName;
-            std::shared_ptr<ComponentConfigurationImpl> mgr;
+            std::vector<std::shared_ptr<ComponentConfigurationImpl>> mgrs;
             {
                 auto listenersMapHandle = listenersMap.lock();
                 if (listenersMapHandle->empty() || pid.empty())
@@ -148,16 +148,27 @@ namespace cppmicroservices
                 {
                     return false;
                 }
-                auto listener = iter->second->begin();
+                auto tokenMapPtr = iter->second;
+                for (auto const& tokenEntry : (*tokenMapPtr))
+                {
+                    auto listener = tokenEntry.second;
 
-                mgr = listener->second.mgr;
-                if (mgr->GetMetadata()->factoryComponentID.empty())
+                    if (!listener.mgr->GetMetadata()->factoryComponentID.empty())
+                    {
+                        // The component in our listeners map is a factory component.
+                        mgrs.emplace_back(listener.mgr);
+                    }
+                }
+                if (mgrs.empty())
                 {
-                    // The component in our listener's map is not a factory component.
+                    // None of the components in our listeners map is a factory component.
                     return false;
                 }
             } // release listenersMapHandle lock
-            CreateFactoryComponent(pid, mgr);
+            for (auto & mgr : mgrs)
+            {
+                CreateFactoryComponent(pid, mgr);
+            }
             return true;
         }
         void