[asterisk-commits] mmichelson: branch 1.6.0 r114626 - in /branches/1.6.0: ./ channels/chan_local.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Apr 24 15:06:38 2008
New Revision: 114626

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114626
Log:
Merged revisions 114625 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r114625 | mmichelson | 2008-04-24 15:06:06 -0500 (Thu, 24 Apr 2008) | 18 lines

Merged revisions 114624 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r114624 | mmichelson | 2008-04-24 15:04:24 -0500 (Thu, 24 Apr 2008) | 10 lines

Resolve a deadlock in chan_local by releasing the channel lock
temporarily.

(closes issue #11712)
Reported by: callguy
Patches:
      11712.patch uploaded by putnopvut (license 60)
Tested by: acunningham


........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_local.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_local.c?view=diff&rev=114626&r1=114625&r2=114626
==============================================================================
--- branches/1.6.0/channels/chan_local.c (original)
+++ branches/1.6.0/channels/chan_local.c Thu Apr 24 15:06:38 2008
@@ -523,7 +523,13 @@
 			/* Deadlock avoidance */
 			while (p->owner && ast_channel_trylock(p->owner)) {
 				ast_mutex_unlock(&p->lock);
+				if (ast) {
+					ast_channel_unlock(ast);
+				}
 				usleep(1);
+				if (ast) {
+					ast_channel_lock(ast);
+				}
 				ast_mutex_lock(&p->lock);
 			}
 			if (p->owner) {