[asterisk-commits] twilson: trunk r285029 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Fri Sep  3 18:23:47 2010
New Revision: 285029

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

........
  r285017 | twilson | 2010-09-03 18:19:54 -0500 (Fri, 03 Sep 2010) | 4 lines
  
  Call correct lock function as transferer is a sip_pvt not a channel
  
  Both functions are #defined to ao2_lock, but still...
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

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

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=285029&r1=285028&r2=285029
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Fri Sep  3 18:23:47 2010
@@ -21767,7 +21767,7 @@
 
 		ast_do_masquerade(target.chan1);
 
-		ast_channel_lock(transferer); /* the transferer pvt is expected to remain locked on return */
+		sip_pvt_lock(transferer); /* the transferer pvt is expected to remain locked on return */
 
 		ast_indicate(target.chan1, AST_CONTROL_UNHOLD);