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/bridge.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/bridge.c')
| -rw-r--r-- | main/bridge.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/main/bridge.c b/main/bridge.c index 5d6d0632a..1c3bf16e3 100644 --- a/main/bridge.c +++ b/main/bridge.c @@ -2497,13 +2497,7 @@ static int try_swap_optimize_out(struct ast_bridge *chan_bridge, other = ast_bridge_channel_peer(src_bridge_channel); if (other && other->state == BRIDGE_CHANNEL_STATE_WAIT) { - unsigned int id; - - if (ast_channel_trylock(other->chan)) { - return 1; - } - - id = ast_atomic_fetchadd_int((int *) &optimization_id, +1); + unsigned int id = ast_atomic_fetchadd_int((int *) &optimization_id, +1); ast_verb(3, "Move-swap optimizing %s <-- %s.\n", ast_channel_name(dst_bridge_channel->chan), @@ -2525,7 +2519,6 @@ static int try_swap_optimize_out(struct ast_bridge *chan_bridge, if (pvt && pvt->callbacks && pvt->callbacks->optimization_finished) { pvt->callbacks->optimization_finished(pvt, res == 1, id); } - ast_channel_unlock(other); } return res; } |