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
This commit is contained in:
parent
40cc550f1f
commit
bd6f29dcb9
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue