[svn-commits] murf: trunk r139662 - in /trunk: ./ main/features.c

[SVN commits to the Digium repositories]

Author: murf
Date: Fri Aug 22 17:32:35 2008
New Revision: 139662

URL: http://svn.digium.com/view/asterisk?view=rev&rev=139662
Log:
Merged revisions 139635 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139635 | murf | 2008-08-22 16:24:02 -0600 (Fri, 22 Aug 2008) | 6 lines

I found some problems with the code I committed earlier, when
I merged them into trunk, so I'm coming back to clean up.
And, in the process, I found an error in the code I added
to trunk and 1.6.x, that I'll fix using this patch also.


........

Modified:
    trunk/   (props changed)
    trunk/main/features.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/features.c
URL: http://svn.digium.com/view/asterisk/trunk/main/features.c?view=diff&rev=139662&r1=139661&r2=139662
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Fri Aug 22 17:32:35 2008
@@ -2360,7 +2360,7 @@
 		ast_copy_string(chan->exten, save_exten, sizeof(chan->exten));
 		chan->priority = save_prio;
 		chan->cdr = swapper;
-		ast_channel_lock(chan);
+		ast_channel_unlock(chan);
 		/* protect the lastapp/lastdata against the effects of the hangup/dialplan code */
 		ast_copy_string(bridge_cdr->lastapp, savelastapp, sizeof(bridge_cdr->lastapp));
 		ast_copy_string(bridge_cdr->lastdata, savelastdata, sizeof(bridge_cdr->lastdata));