[asterisk-commits] dvossel: branch 1.6.2 r219376 - in /branches/1.6.2: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Sep 17 17:38:47 2009
New Revision: 219376

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=219376
Log:
Merged revisions 219371 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r219371 | dvossel | 2009-09-17 17:37:28 -0500 (Thu, 17 Sep 2009) | 9 lines
  
  fixes deadlock when performing directed pickup w Invite/replaces
  
  (closes issue #15340)
  Reported by: lmsteffan
  Patches:
        deadlock.patch uploaded by lmsteffan (license 779)
  Tested by: lmsteffan
........

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

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

Modified: branches/1.6.2/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/channels/chan_sip.c?view=diff&rev=219376&r1=219375&r2=219376
==============================================================================
--- branches/1.6.2/channels/chan_sip.c (original)
+++ branches/1.6.2/channels/chan_sip.c Thu Sep 17 17:38:47 2009
@@ -19716,7 +19716,9 @@
 			do_magic_pickup(c, pickup.exten, pickup.context);
 
 			/* Now we're either masqueraded or we failed to pickup, in either case we... */
+			sip_pvt_unlock(p);
 			ast_hangup(c);
+			sip_pvt_lock(p);
 
 			return 0;
 		} else {