kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-24 06:53:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 376660 via svnmerge from

Browse Source 
file:///srv/subversion/repos/asterisk/trunk

................
  r376660 | rmudgett | 2012-11-27 14:39:51 -0600 (Tue, 27 Nov 2012) | 27 lines
  
  Remove unnecessary channel module references.
  
  * Removed call to ast_module_user_hangup_all() in res_config_mysql.c since
  it is effectively a noop.  No channels can attach a reference to that
  module.
  
  * Removed call to ast_module_user_hangup_all() in app_celgenuserevent.c.
  The caller of unload_module() has already called it.
  
  * Removed redundant channel module references in pbx_dundi.c.  The
  registered dialplan function callback dispatchers for the read/read2/write
  callbacks already reference the module before calling.
  
  * pbx_dundi: Moved unregistering CLI commands, DUNDi switch, and dialplan
  functions to the first thing the unload_module() does.  This will reduce
  the chance of new channels using DUNDi services while the module is being
  torn down.
  ........
  
  Merged revisions 376657 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........
  
  Merged revisions 376658 from http://svn.asterisk.org/svn/asterisk/branches/10
  ........
  
  Merged revisions 376659 from http://svn.asterisk.org/svn/asterisk/branches/11
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@376667 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2012-11-27 21:19:40 +00:00
parent 8c84eb128f
commit a825576277
3 changed files with 8 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
addons/res_config_mysql.c
View File

@@ -1393,9 +1393,6 @@ static int unload_module(void)
ast_config_engine_deregister(&mysql_engine);
ast_verb(2, "MySQL RealTime unloaded.\n");
ast_module_user_hangup_all();
usleep(1);
AST_RWLIST_WRLOCK(&databases);
while ((cur = AST_RWLIST_REMOVE_HEAD(&databases, list))) {
mysql_close(&cur->handle);