[asterisk-commits] russell: branch 1.6.0 r190358 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Apr 23 16:14:29 2009
New Revision: 190358

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=190358
Log:
Merged revisions 190357 via svnmerge from 
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().

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=190358&r1=190357&r2=190358
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Thu Apr 23 16:14:29 2009
@@ -17619,7 +17619,6 @@
 		ast_clear_flag(&transferer->flags[0], SIP_GOTREFER);
 		transferer->refer->status = REFER_FAILED;
 		sip_pvt_unlock(targetcall_pvt);
-		ast_channel_unlock(current->chan1);
 		return -1;
 	}