]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 190357 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Thu, 23 Apr 2009 21:20:31 +0000 (21:20 +0000)
committerRussell Bryant <russell@russellbryant.com>
Thu, 23 Apr 2009 21:20:31 +0000 (21:20 +0000)
https://origsvn.digium.com/svn/asterisk/trunk

................
r190357 | russell | 2009-04-23 16:13:07 -0500 (Thu, 23 Apr 2009) | 10 lines

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

........
r190356 | russell | 2009-04-23 16:07:07 -0500 (Thu, 23 Apr 2009) | 2 lines

Remove a bogus ast_channel_unlock().

........

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@190371 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

index 18b13b1bfafbf6cd02b2e7a6eb8679e02b2a321e..1227e8ed6d6c1e3028b72ea93bea69c3cd2033f7 100644 (file)
@@ -18489,7 +18489,6 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual *
                ast_clear_flag(&transferer->flags[0], SIP_GOTREFER);
                transferer->refer->status = REFER_FAILED;
                sip_pvt_unlock(targetcall_pvt);
-               ast_channel_unlock(current->chan1);
                if (targetcall_pvt)
                        ao2_t_ref(targetcall_pvt, -1, "Drop targetcall_pvt pointer");
                return -1;