Merge pull request #402 from apache/hotfix/framework_shutdown_deadlock

Fix a first-check-then-do race condition during framework shutdown.
apache · Mar 18, 2022 · c83bc07 · c83bc07
2 parents 3b651da + aa98685
commit c83bc07
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/libs/framework/src/framework.c b/libs/framework/src/framework.c
@@ -1591,7 +1591,7 @@ static inline bool fw_removeTopEventFromQueue(celix_framework_t* fw) {
 static inline void fw_handleEvents(celix_framework_t* framework) {
     celixThreadMutex_lock(&framework->dispatcher.mutex);
     int size = framework->dispatcher.eventQueueSize + celix_arrayList_size(framework->dispatcher.dynamicEventQueue);
-    if (size == 0) {
+    if (size == 0 && framework->dispatcher.active) {
         celixThreadCondition_timedwaitRelative(&framework->dispatcher.cond, &framework->dispatcher.mutex, 1, 0);
     }
     size = framework->dispatcher.eventQueueSize + celix_arrayList_size(framework->dispatcher.dynamicEventQueue);