From 1212906351c3f4f5f759396c32b5e1dbabd403a4 Mon Sep 17 00:00:00 2001 From: "David M. Lee" Date: Thu, 5 Dec 2013 22:10:20 +0000 Subject: Reverting r403311. It's causing ARI tests to hang. ........ Merged revisions 403398 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403404 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_jingle.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'channels/chan_jingle.c') diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c index 8604d4eb9..56c15b193 100644 --- a/channels/chan_jingle.c +++ b/channels/chan_jingle.c @@ -864,7 +864,6 @@ static struct ast_channel *jingle_new(struct jingle *client, struct jingle_pvt * return NULL; } - ast_channel_lock(tmp); ast_channel_stage_snapshot(tmp); ast_channel_tech_set(tmp, &jingle_tech); @@ -942,7 +941,6 @@ static struct ast_channel *jingle_new(struct jingle *client, struct jingle_pvt * ast_jb_configure(tmp, &global_jbconf); ast_channel_stage_snapshot_done(tmp); - ast_channel_unlock(tmp); if (state != AST_STATE_DOWN && ast_pbx_start(tmp)) { ast_log(LOG_WARNING, "Unable to start PBX on %s\n", ast_channel_name(tmp)); @@ -1117,9 +1115,7 @@ static int jingle_newcall(struct jingle *client, ikspak *pak) } ast_mutex_unlock(&p->lock); - ast_channel_lock(chan); ast_setstate(chan, AST_STATE_RING); - ast_channel_unlock(chan); res = ast_pbx_start(chan); switch (res) { -- cgit v1.2.3