[svn-commits] tilghman: branch 1.6.0 r125854 - in /branches/1.6.0: ./ channels/chan_local.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Jun 27 11:01:47 2008
New Revision: 125854

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

........
r125853 | tilghman | 2008-06-27 11:00:05 -0500 (Fri, 27 Jun 2008) | 3 lines

Revert half of the fix, as this part may have been unnecessary (related to issue #12914)
Requested here: http://lists.digium.com/pipermail/asterisk-dev/2008-June/033658.html

........

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=125854&r1=125853&r2=125854
==============================================================================
--- branches/1.6.0/channels/chan_local.c (original)
+++ branches/1.6.0/channels/chan_local.c Fri Jun 27 11:01:47 2008
@@ -516,11 +516,7 @@
 	if (!p)
 		return -1;
 
-	while (ast_mutex_trylock(&p->lock)) {
-		ast_channel_unlock(ast);
-		usleep(1);
-		ast_channel_lock(ast);
-	}
+	ast_mutex_lock(&p->lock);
 
 	if (p->chan && ast_test_flag(ast, AST_FLAG_ANSWERED_ELSEWHERE)) 
 		ast_set_flag(p->chan, AST_FLAG_ANSWERED_ELSEWHERE);