[asterisk-commits] irroot: branch irroot/distrotech-customers-trunk r336376 - in /team/irroot/di...

[SVN commits to the Asterisk project]

Author: irroot
Date: Mon Sep 19 03:28:21 2011
New Revision: 336376

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=336376
Log:
Fix for ASTERISK-18573
> when adding lock in app_queue mistyped it

Modified:
    team/irroot/distrotech-customers-trunk/apps/app_queue.c
    team/irroot/distrotech-customers-trunk/channels/chan_sip.c

Modified: team/irroot/distrotech-customers-trunk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/apps/app_queue.c?view=diff&rev=336376&r1=336375&r2=336376
==============================================================================
--- team/irroot/distrotech-customers-trunk/apps/app_queue.c (original)
+++ team/irroot/distrotech-customers-trunk/apps/app_queue.c Mon Sep 19 03:28:21 2011
@@ -5088,10 +5088,10 @@
 				if ((newcdr = ast_cdr_dup(cdr))) {
 					ast_cdr_init(newcdr, qe->chan);
 					ast_cdr_reset(newcdr, 0);
-					ast_lock_channel(qe->chan);
+					ast_channel_lock(qe->chan);
 					cdr = ast_cdr_append(cdr, newcdr);
 					cdr = cdr->next;
-					ast_unlock_channel(qe->chan);
+					ast_channel_unlocks(qe->chan);
 				}
 			}
 			ast_copy_string(cdr->dstchannel, member->membername, sizeof(cdr->dstchannel));

Modified: team/irroot/distrotech-customers-trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/channels/chan_sip.c?view=diff&rev=336376&r1=336375&r2=336376
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/chan_sip.c (original)
+++ team/irroot/distrotech-customers-trunk/channels/chan_sip.c Mon Sep 19 03:28:21 2011
@@ -25734,6 +25734,7 @@
 			dialog_unlink_all(p, TRUE, TRUE);
 			dialog_unref(p, "unref dialog p just created via sip_alloc");
 			/* sip_destroy(p); */
+			ao2_unlock(peer);
 			return -1;
 		}
 		/* Recalculate our side, and recalculate Call ID */