RemoveBoundServicesCache fix

Fixed problem in RemoveBoundServicesCache with stale services being left in the boundServicesCache when sObjs.GetService call fails. sObjs.GetService can't fail in this situation. Just removed the test.
CppMicroServices · May 12, 2021 · 93b4cbf · 93b4cbf
1 parent 61f8a8a
commit 93b4cbf
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 27 deletions.
diff --git a/compendium/DeclarativeServices/src/ComponentContextImpl.cpp b/compendium/DeclarativeServices/src/ComponentContextImpl.cpp
@@ -229,7 +229,7 @@ bool ComponentContextImpl::AddToBoundServicesCache(
   return true;
 }
 
-bool ComponentContextImpl::RemoveFromBoundServicesCache(
+void ComponentContextImpl::RemoveFromBoundServicesCache(
   const std::string& refName,
   const cppmicroservices::ServiceReferenceBase& sRef)
 {
@@ -238,9 +238,6 @@ bool ComponentContextImpl::RemoveFromBoundServicesCache(
     bc.GetServiceObjects(ServiceReferenceU(sRef));
 
   const auto removedService = sObjs.GetService();
-  if (!removedService) {
-      return false;
-  }
   const auto& serviceInterface = removedService->begin()->first;
   auto boundServicesCacheHandle = boundServicesCache.lock();
   auto& services = boundServicesCacheHandle->at(refName);
@@ -261,7 +258,7 @@ bool ComponentContextImpl::RemoveFromBoundServicesCache(
                 servicesMap->at(serviceInterface));
       }),
     services.end());
-  return true;
+  return;
 }
 
 }

diff --git a/compendium/DeclarativeServices/src/ComponentContextImpl.hpp b/compendium/DeclarativeServices/src/ComponentContextImpl.hpp
@@ -200,7 +200,7 @@ class ComponentContextImpl
   bool AddToBoundServicesCache(const std::string& refName
                              , const cppmicroservices::ServiceReferenceBase& sRef);
 
-  bool RemoveFromBoundServicesCache(const std::string& refName
+  void RemoveFromBoundServicesCache(const std::string& refName
                              , const cppmicroservices::ServiceReferenceBase& sRef);
 
 private:

diff --git a/compendium/DeclarativeServices/src/manager/BundleOrPrototypeComponentConfiguration.cpp b/compendium/DeclarativeServices/src/manager/BundleOrPrototypeComponentConfiguration.cpp
@@ -146,23 +146,21 @@ void BundleOrPrototypeComponentConfigurationImpl::UnbindReference(const std::str
                                                                  )
 {
   auto instancePairs = compInstanceMap.lock();
-  for (auto const& instancePair: *instancePairs)
+  for (auto const& instancePair : *instancePairs)
   {
-    auto& instance = instancePair.first;
-    auto& context = instancePair.second;
-    try {
-      instance->InvokeUnbindMethod(refName, ref);
-    } catch (const std::exception&) {
-      GetLogger()->Log(cppmicroservices::logservice::SeverityLevel::LOG_ERROR,
-                       "Exception received from user code while unbinding a "
-                       "service reference.",
-                       std::current_exception());
-    }
-
-    if (!context->RemoveFromBoundServicesCache(refName, ref)) {
-        GetLogger()->Log(cppmicroservices::logservice::SeverityLevel::LOG_ERROR,
-            "Failure when removing a reference from the BoundServices Cache");
-    }
+      auto& instance = instancePair.first;
+      auto& context = instancePair.second;
+      try {
+          instance->InvokeUnbindMethod(refName, ref);
+      }
+      catch (const std::exception&) {
+          GetLogger()->Log(cppmicroservices::logservice::SeverityLevel::LOG_ERROR,
+              "Exception received from user code while unbinding a "
+              "service reference.",
+              std::current_exception());
+      }
+
+      context->RemoveFromBoundServicesCache(refName, ref);
   }
 }
 

diff --git a/compendium/DeclarativeServices/src/manager/SingletonComponentConfiguration.cpp b/compendium/DeclarativeServices/src/manager/SingletonComponentConfiguration.cpp
@@ -156,11 +156,7 @@ void SingletonComponentConfigurationImpl::UnbindReference(const std::string& ref
                      std::current_exception());
   }
   auto context = GetComponentContext();
-  if (!context->RemoveFromBoundServicesCache(refName, ref)) {
-      GetLogger()->Log(cppmicroservices::logservice::SeverityLevel::LOG_ERROR,
-          "Failure when removing a reference from the BoundServices Cache");
-  }
-
+  context->RemoveFromBoundServicesCache(refName, ref);
 }
 
 void SingletonComponentConfigurationImpl::SetComponentInstancePair(InstanceContextPair instCtxtPair)