From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 3 Jul 2015 16:41:49 +0000 (-0500)
Subject: FS-7486
X-Git-Tag: v1.4.21~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b95362f965bf4cfc34afcbc7117f0d3c9abbaf86;p=thirdparty%2Ffreeswitch.git

FS-7486
---

diff --git a/src/switch_core_session.c b/src/switch_core_session.c
index 4e02b735c7..6dc2dbd96a 100644
--- a/src/switch_core_session.c
+++ b/src/switch_core_session.c
@@ -1848,9 +1848,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) {