[svn-commits] irroot: branch irroot/distrotech-customers-1.8 r322043 - in /team/irroot/dist...

[SVN commits to the Digium repositories]

Author: irroot
Date: Sun Jun  5 07:46:57 2011
New Revision: 322043

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=322043
Log:
Fix Conflicts

Modified:
    team/irroot/distrotech-customers-1.8/   (props changed)
    team/irroot/distrotech-customers-1.8/channels/chan_local.c
    team/irroot/distrotech-customers-1.8/configure

Propchange: team/irroot/distrotech-customers-1.8/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/irroot/distrotech-customers-1.8/
            ('branch-1.6.2-blocked' removed)

Propchange: team/irroot/distrotech-customers-1.8/
            ('branch-1.6.2-merged' removed)

Propchange: team/irroot/distrotech-customers-1.8/
------------------------------------------------------------------------------
    svn:mergeinfo = /branches/1.8:318982-322028

Modified: team/irroot/distrotech-customers-1.8/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/channels/chan_local.c?view=diff&rev=322043&r1=322042&r2=322043
==============================================================================
--- team/irroot/distrotech-customers-1.8/channels/chan_local.c (original)
+++ team/irroot/distrotech-customers-1.8/channels/chan_local.c Sun Jun  5 07:46:57 2011
@@ -597,9 +597,6 @@
 	}
 
 	/* Just queue for delivery to the other side */
-	while(ao2_trylock(p)) {
-		CHANNEL_DEADLOCK_AVOIDANCE(ast);
-	}
 	ao2_ref(p, 1); /* ref for local_queue_frame */
 	ao2_lock(p);
 	isoutbound = IS_OUTBOUND(ast, p);