diff options
| author | David M. Lee <dlee@digium.com> | 2013-12-05 22:10:20 +0000 |
|---|---|---|
| committer | David M. Lee <dlee@digium.com> | 2013-12-05 22:10:20 +0000 |
| commit | 1212906351c3f4f5f759396c32b5e1dbabd403a4 (patch) | |
| tree | 285c7eea05e3b246fe9560fae93d9d79dd5f2ad0 /main/stasis_bridges.c | |
| parent | fc70db3a810dae81e0ba0e09ecf11468bbef4d54 (diff) | |
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
Diffstat (limited to 'main/stasis_bridges.c')
| -rw-r--r-- | main/stasis_bridges.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/main/stasis_bridges.c b/main/stasis_bridges.c index dd22710b1..b92d048bc 100644 --- a/main/stasis_bridges.c +++ b/main/stasis_bridges.c @@ -397,9 +397,7 @@ struct stasis_message *ast_bridge_blob_create( } if (chan) { - ast_channel_lock(chan); obj->channel = ast_channel_snapshot_create(chan); - ast_channel_unlock(chan); if (obj->channel == NULL) { return NULL; } @@ -581,9 +579,7 @@ static int bridge_channel_snapshot_pair_init(struct ast_bridge_channel_pair *pai } } - ast_channel_lock(pair->channel); snapshot_pair->channel_snapshot = ast_channel_snapshot_create(pair->channel); - ast_channel_unlock(pair->channel); if (!snapshot_pair->channel_snapshot) { return -1; } @@ -919,9 +915,7 @@ void ast_bridge_publish_attended_transfer_link(int is_external, enum ast_transfe transfer_msg->dest_type = AST_ATTENDED_TRANSFER_DEST_LINK; for (i = 0; i < 2; ++i) { - ast_channel_lock(locals[i]); transfer_msg->dest.links[i] = ast_channel_snapshot_create(locals[i]); - ast_channel_unlock(locals[i]); if (!transfer_msg->dest.links[i]) { return; } |