diff options
| author | Paul Belanger <paul.belanger@polybeacon.com> | 2010-11-29 23:07:06 +0000 |
|---|---|---|
| committer | Paul Belanger <paul.belanger@polybeacon.com> | 2010-11-29 23:07:06 +0000 |
| commit | bd6f29dcb924dd1b1d643dcb327dbcee72f7f374 (patch) | |
| tree | 7de262374571dd081a85b5b75b966eb31a7928bc /channels | |
| parent | 40cc550f1fac93bb7342dcf0f124ba5eef954c8e (diff) | |
Merged revisions 296673 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r296673 | pabelanger | 2010-11-29 18:05:45 -0500 (Mon, 29 Nov 2010) | 19 lines
Merged revisions 296671 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r296671 | pabelanger | 2010-11-29 17:54:14 -0500 (Mon, 29 Nov 2010) | 12 lines
Merged revisions 296670 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r296670 | pabelanger | 2010-11-29 17:49:39 -0500 (Mon, 29 Nov 2010) | 5 lines
Make sure nothing else is needed before destroying the scheduler.
(closes issue #18398)
Reported by: pabelanger
........
................
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@296674 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_iax2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index e30ec3029..a32c64b83 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -14218,8 +14218,6 @@ static int __unload_module(void) cleanup_thread_list(&active_list); cleanup_thread_list(&dynamic_list); - sched = ast_sched_thread_destroy(sched); - ast_netsock_release(netsock); ast_netsock_release(outsock); for (x = 0; x < ARRAY_LEN(iaxs); x++) { @@ -14261,6 +14259,7 @@ static int __unload_module(void) ast_timer_close(timer); } transmit_processor = ast_taskprocessor_unreference(transmit_processor); + sched = ast_sched_thread_destroy(sched); con = ast_context_find(regcontext); if (con) |