gh-215: Remove all remaining scheduled events for an inactive dispatc…

…her.
apache · Jun 12, 2024 · d384c86 · d384c86
1 parent e07b2e8
commit d384c86
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/libs/framework/src/framework.c b/libs/framework/src/framework.c
@@ -1531,12 +1531,12 @@ static void *fw_eventDispatcher(void *fw) {
     }
 
     //not active anymore, extra runs for possible request leftovers
+    celix_framework_processScheduledEvents(framework);
     celixThreadMutex_lock(&framework->dispatcher.mutex);
     bool needExtraRun = celix_framework_eventQueueSize(fw) > 0;
     celixThreadMutex_unlock(&framework->dispatcher.mutex);
     while (needExtraRun) {
         fw_handleEvents(framework);
-        celix_framework_processScheduledEvents(framework);
         celixThreadMutex_lock(&framework->dispatcher.mutex);
         needExtraRun = celix_framework_eventQueueSize(fw) > 0;
         celixThreadMutex_unlock(&framework->dispatcher.mutex);