]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-7486
authorAnthony Minessale <anthm@freeswitch.org>
Fri, 3 Jul 2015 16:41:49 +0000 (11:41 -0500)
committerMichael Jerris <mike@jerris.com>
Fri, 3 Jul 2015 18:22:20 +0000 (14:22 -0400)
src/switch_core_session.c

index 5c0eef4a4d035c3615a91c64af0178a668bdd5e1..457343449290721c7fa9fe134b03baaad26b6674 100644 (file)
@@ -1862,9 +1862,10 @@ static void *SWITCH_THREAD_FUNC switch_core_session_thread_pool_manager(switch_t
                        xsleep = 10000;
                }
 
-               switch_mutex_lock(session_manager.cond2_mutex);
-               switch_thread_cond_timedwait(session_manager.cond, session_manager.cond_mutex, xsleep);
-               switch_mutex_unlock(session_manager.cond2_mutex);
+               if (switch_mutex_trylock(session_manager.cond2_mutex) == SWITCH_STATUS_SUCCESS) {
+                       switch_thread_cond_timedwait(session_manager.cond, session_manager.cond_mutex, xsleep);
+                       switch_mutex_unlock(session_manager.cond2_mutex);
+               }
                
 
                if (switch_micro_time_now() >= next) {