Merge pull request #380 from PengZheng/fix-tracker-assertion

Fix assertion failure when using C++ ServiceTracker in the event loop.
apache · Nov 21, 2021 · 71fac23 · 71fac23
2 parents 82dab97 + 64b7293
commit 71fac23
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/libs/framework/gtest/src/CxxBundleContextTestSuite.cc b/libs/framework/gtest/src/CxxBundleContextTestSuite.cc
@@ -550,6 +550,20 @@ TEST_F(CxxBundleContextTestSuite, UnregisterServiceWhileRegistering) {
     ctx->waitForEvents();
 }
 
+TEST_F(CxxBundleContextTestSuite, GetServiceInEventLoop) {
+    auto context = ctx;
+    ctx->getFramework()->fireGenericEvent(
+            ctx->getBundleId(),
+            "register/unregister in Celix event thread",
+            [context]() {
+                auto tracker = context->trackServices<TestInterface>().build();
+                auto svc = tracker->getHighestRankingService();
+                EXPECT_TRUE(svc.get() == nullptr);
+            }
+    );
+    ctx->waitForEvents();
+}
+
 TEST_F(CxxBundleContextTestSuite, KeepSharedPtrActiveWhileDeregistering) {
     auto svcReg = ctx->registerService<TestInterface>(std::make_shared<TestImplementation>())
             .build();
@@ -653,4 +667,4 @@ TEST_F(CxxBundleContextTestSuite, CheckStandardServiceProperties) {
     EXPECT_TRUE(called);
 
     celix_bundleContext_unregisterService(ctx->getCBundleContext(), svcId);
-}
+}
diff --git a/libs/framework/include/celix/Trackers.h b/libs/framework/include/celix/Trackers.h
@@ -159,7 +159,7 @@ namespace celix {
          */
         void waitIfAble() const {
             auto* fw = celix_bundleContext_getFramework(cCtx.get());
-            if (celix_framework_isCurrentThreadTheEventLoop(fw)) {
+            if (!celix_framework_isCurrentThreadTheEventLoop(fw)) {
                 wait();
             }
         }
@@ -765,4 +765,4 @@ namespace celix {
         const std::vector<std::function<void(const ServiceTrackerInfo&)>> onTrackerDestroyed;
     };
 
-}
+}