Skip to content
Permalink
Browse files
Merge branch 'hotfix/framework_shutdown_deadlock' into conan_support
  • Loading branch information
PengZheng committed Mar 17, 2022
2 parents b3ee231 + aa98685 commit 98191a98f6c3b5ee1c666c4bc45455cdb13426ca
Showing 1 changed file with 1 addition and 1 deletion.
@@ -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);

0 comments on commit 98191a9

Please sign in to comment.