Workaround the lifecycle management issue of IImportRegistration.

It avoids a testing crash.
apache · Sep 25, 2023 · f371369 · f371369
1 parent e7aee12
commit f371369
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/bundles/cxx_remote_services/admin/src/RemoteServiceAdmin.cc b/bundles/cxx_remote_services/admin/src/RemoteServiceAdmin.cc
@@ -115,6 +115,7 @@ void celix::rsa::RemoteServiceAdmin::removeImportedServiceFactory(
     importServiceFactories.erase(targetServiceName);
 
     //TODO remove imported services from this factory ??needed
+    //FIXME yes, it will lead to crash if we uninstall the factory: https://github.com/apache/celix/issues/653
 }
 
 void celix::rsa::RemoteServiceAdmin::addExportedServiceFactory(

diff --git a/bundles/cxx_remote_services/integration/gtest/src/RemoteServicesIntegrationTestSuite.cc b/bundles/cxx_remote_services/integration/gtest/src/RemoteServicesIntegrationTestSuite.cc
@@ -57,8 +57,8 @@ class RemoteServicesIntegrationTestSuite : public ::testing::Test {
                 PS_PSA_BUNDLE_LOC,
                 PS_WIRE_BUNDLE_LOC,
                 RS_DISCOVERY_BUNDLE_LOC,
-                RS_RSA_BUNDLE_LOC,
-                RS_FACTORY_BUNDLE_LOC };
+                RS_FACTORY_BUNDLE_LOC ,
+                RS_RSA_BUNDLE_LOC};
         for (const auto& bndLoc : sharedBundles) {
             auto bndId = ctx->installBundle(bndLoc);
             EXPECT_GE(bndId, 0);