[svn-commits] mnicholson: branch 1.6.0 r229100 - /branches/1.6.0/channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: mnicholson
Date: Tue Nov 10 09:41:46 2009
New Revision: 229100

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

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

Modified:
    branches/1.6.0/channels/chan_sip.c

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=229100&r1=229099&r2=229100
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Tue Nov 10 09:41:46 2009
@@ -5270,20 +5270,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);