[svn-commits] mnicholson: branch 1.6.2 r229088 - in /branches/1.6.2: ./ channels/ main/edit...

[SVN commits to the Digium repositories]

Author: mnicholson
Date: Tue Nov 10 09:16:47 2009
New Revision: 229088

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=229088
Log:
Reverted revision 202007.

(closes issue #16175)
Reported by: paul-tg
Tested by: paul-tg

Modified:
    branches/1.6.2/UPGRADE-1.6.txt   (props changed)
    branches/1.6.2/UPGRADE.txt   (props changed)
    branches/1.6.2/channels/chan_sip.c
    branches/1.6.2/main/editline/makelist.in   (props changed)

Propchange: branches/1.6.2/UPGRADE-1.6.txt
            ('svn:mergeinfo' removed)

Propchange: branches/1.6.2/UPGRADE.txt
            ('svn:mergeinfo' removed)

Modified: branches/1.6.2/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_sip.c?view=diff&rev=229088&r1=229087&r2=229088
==============================================================================
--- branches/1.6.2/channels/chan_sip.c (original)
+++ branches/1.6.2/channels/chan_sip.c Tue Nov 10 09:16:47 2009
@@ -6166,20 +6166,8 @@
 	int fmt;
 	const char *codec;
 
-	while (p->owner && ast_channel_trylock(p->owner)) {
-		sip_pvt_unlock(p);
-		sched_yield();
-		sip_pvt_lock(p);
-	}
-
-	if (!p->owner)
-		return;
-
-	codec = ast_strdupa(S_OR(pbx_builtin_getvar_helper(p->owner, "SIP_CODEC"), ""));
-
-	ast_channel_unlock(p->owner);
-
-	if (ast_strlen_zero(codec))
+	codec = pbx_builtin_getvar_helper(p->owner, "SIP_CODEC");
+	if (!codec) 
 		return;
 
 	fmt = ast_getformatbyname(codec);

Propchange: branches/1.6.2/main/editline/makelist.in
            ('svn:mergeinfo' removed)