diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-13 19:50:37 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-13 19:50:37 +0000 |
| commit | 597274493ab11d4ab24c3f9aca7df70e915f3c22 (patch) | |
| tree | bf166f2c89c452907c9485cb778e3d6562d13967 /main | |
| parent | 492f38073fe190e17da14aed413230d11e760bf3 (diff) | |
Recorded merge of revisions 194357 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r194357 | mmichelson | 2009-05-13 14:42:51 -0500 (Wed, 13 May 2009) | 18 lines
Blocked revisions 194356 via svnmerge
........
r194356 | mmichelson | 2009-05-13 14:41:44 -0500 (Wed, 13 May 2009) | 13 lines
Remove an extraneous unlocking operation from ast_channel_free.
In the case that we could not remove the desired channel from the
list of channels, there was an extra call to unlock the channel list.
Since we unlock the list later on in the function anyway, this results
in the list being unlocked twice yet only being locked once.
(closes issue #15098)
Reported by: tim_ringenbach
Patches:
remove_extra_unlock.diff uploaded by tim (license 540)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@194359 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index 4e854a5e8..106bd2ae5 100644 --- a/main/channel.c +++ b/main/channel.c @@ -1330,7 +1330,6 @@ void ast_channel_free(struct ast_channel *chan) AST_RWLIST_WRLOCK(&channels); if (!AST_RWLIST_REMOVE(&channels, chan, chan_list)) { - AST_RWLIST_UNLOCK(&channels); ast_log(LOG_ERROR, "Unable to find channel in list to free. Assuming it has already been done.\n"); } /* Lock and unlock the channel just to be sure nobody has it locked still |