diff options
| author | Automerge script <automerge@asterisk.org> | 2012-11-27 21:19:40 +0000 |
|---|---|---|
| committer | Automerge script <automerge@asterisk.org> | 2012-11-27 21:19:40 +0000 |
| commit | a82557627740d7b1794e2b279cd89e2bde0d5280 (patch) | |
| tree | d1f902dbc5ececd1f654fa78ffb0103ccb636c78 /addons | |
| parent | 8c84eb128fe4e250acac1929ab4a4aa687898898 (diff) | |
Merged revisions 376660 via svnmerge from
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
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/res_config_mysql.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/addons/res_config_mysql.c b/addons/res_config_mysql.c index 4984dbdc9..fe8b845e8 100644 --- a/addons/res_config_mysql.c +++ b/addons/res_config_mysql.c @@ -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); |