[asterisk-commits] rmudgett: branch 10 r329145 - in /branches/10: ./ main/features.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Jul 21 11:52:17 2011
New Revision: 329145

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=329145
Log:
Merged revisions 329144 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r329144 | rmudgett | 2011-07-21 11:46:21 -0500 (Thu, 21 Jul 2011) | 9 lines
  
  Dialplan bridge() app mutex 'current_dest_chan' freed more times than we've locked!
  
  This appears to be a leftover from when ast_channel was converted to ao2
  objects.
  
  Simply removed the extraneous unlock.
  
  (closes issue ASTERISK-17772)
........

Modified:
    branches/10/   (props changed)
    branches/10/main/features.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/main/features.c?view=diff&rev=329145&r1=329144&r2=329145
==============================================================================
--- branches/10/main/features.c (original)
+++ branches/10/main/features.c Thu Jul 21 11:52:17 2011
@@ -6149,8 +6149,6 @@
 					"Channel2: %s\r\n", chan->name, args.dest_chan);
 	}
 
-	ast_channel_unlock(current_dest_chan);
-
 	do_bridge_masquerade(current_dest_chan, final_dest_chan);
 
 	chans[0] = current_dest_chan;