[svn-commits] dvossel: branch dvossel/masq_locking_order_trunk r222539 - /team/dvossel/masq...

[SVN commits to the Digium repositories]

Author: dvossel
Date: Wed Oct  7 12:27:00 2009
New Revision: 222539

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=222539
Log:
I'm about to commit a change into trunk that will break
this branch if I don't revert this back to the way it was.
Basically I'm reverting and letting automerge add it back
once its in trunk.


Modified:
    team/dvossel/masq_locking_order_trunk/channels/chan_sip.c

Modified: team/dvossel/masq_locking_order_trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/masq_locking_order_trunk/channels/chan_sip.c?view=diff&rev=222539&r1=222538&r2=222539
==============================================================================
--- team/dvossel/masq_locking_order_trunk/channels/chan_sip.c (original)
+++ team/dvossel/masq_locking_order_trunk/channels/chan_sip.c Wed Oct  7 12:27:00 2009
@@ -19744,8 +19744,8 @@
 			call we are replacing exists, so an accepted
 			can't harm */
 		transmit_response_with_sdp(p, "200 OK", req, XMIT_RELIABLE, FALSE, FALSE);
+		/* Do something more clever here */
 		ast_channel_unlock(c);
-		*nounlock = 1;
 		ast_channel_unlock(replacecall);
 		sip_pvt_unlock(p->refer->refer_call);
 		return 1;