[asterisk-commits] rmudgett: branch rmudgett/bch_shift_trunk r311683 - in /team/rmudgett/bch_shi...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Mar 25 13:00:04 2011
New Revision: 311683

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=311683
Log:
Merged revisions 311682 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/team/rmudgett/bch_shift_v1.8

........
  r311682 | rmudgett | 2011-03-25 12:58:58 -0500 (Fri, 25 Mar 2011) | 1 line
  
  Prevent potential deadlock with failed idle call.
........

Modified:
    team/rmudgett/bch_shift_trunk/   (props changed)
    team/rmudgett/bch_shift_trunk/channels/sig_pri.c

Propchange: team/rmudgett/bch_shift_trunk/
------------------------------------------------------------------------------
--- bch_shift_v1.8-integrated (original)
+++ bch_shift_v1.8-integrated Fri Mar 25 13:00:04 2011
@@ -1,1 +1,1 @@
-/team/rmudgett/bch_shift_v1.8:1-311678
+/team/rmudgett/bch_shift_v1.8:1-311682

Modified: team/rmudgett/bch_shift_trunk/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bch_shift_trunk/channels/sig_pri.c?view=diff&rev=311683&r1=311682&r2=311683
==============================================================================
--- team/rmudgett/bch_shift_trunk/channels/sig_pri.c (original)
+++ team/rmudgett/bch_shift_trunk/channels/sig_pri.c Fri Mar 25 13:00:04 2011
@@ -5429,7 +5429,9 @@
 						pri->pvts[nextidle]->isidlecall = 1;
 						if (ast_pthread_create_background(&p, NULL, do_idle_thread, pri->pvts[nextidle])) {
 							ast_log(LOG_WARNING, "Unable to start new thread for idle channel '%s'\n", idle->name);
+							ast_mutex_unlock(&pri->lock);
 							ast_hangup(idle);
+							ast_mutex_lock(&pri->lock);
 						}
 					} else {
 						pri->pvts[nextidle]->allocated = 0;