[asterisk-commits] may: branch may/chan_ooh323_evo r378192 - in /team/may/chan_ooh323_evo: ./ main/

[SVN commits to the Asterisk project]

Author: may
Date: Fri Dec 21 15:27:18 2012
New Revision: 378192

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=378192
Log:
Cleanup taskprocessor on exit.

* Cleanup CLI commands on exit.

(issue ASTERISK-20649)
Reported by: Corey Farrell
Patches:
      taskprocessor-cleanup-1_8-11-trunk.patch (license #5909) patch uploaded by Corey Farrell
      taskprocessor-cleanup-10-only.patch (license #5909) patch uploaded by Corey Farrell
      Modified
........

Merged revisions 377837 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 377838 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 377839 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 377841 from http://svn.asterisk.org/svn/asterisk/trunk

Modified:
    team/may/chan_ooh323_evo/   (props changed)
    team/may/chan_ooh323_evo/main/taskprocessor.c

Propchange: team/may/chan_ooh323_evo/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Propchange: team/may/chan_ooh323_evo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 21 15:27:18 2012
@@ -1,1 +1,1 @@
-/trunk:376341-376345
+/trunk:376341-376345,377841

Propchange: team/may/chan_ooh323_evo/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Dec 21 15:27:18 2012
@@ -1,1 +1,1 @@
-/trunk:1-377812
+/trunk:1-377812,377841

Modified: team/may/chan_ooh323_evo/main/taskprocessor.c
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_evo/main/taskprocessor.c?view=diff&rev=378192&r1=378191&r2=378192
==============================================================================
--- team/may/chan_ooh323_evo/main/taskprocessor.c (original)
+++ team/may/chan_ooh323_evo/main/taskprocessor.c Fri Dec 21 15:27:18 2012
@@ -122,10 +122,15 @@
 	AST_CLI_DEFINE(cli_tps_report, "List instantiated task processors and statistics"),
 };
 
-/*! \internal \brief Clean up resources on Asterisk shutdown */
+/*!
+ * \internal
+ * \brief Clean up resources on Asterisk shutdown
+ */
 static void tps_shutdown(void)
 {
+	ast_cli_unregister_multiple(taskprocessor_clis, ARRAY_LEN(taskprocessor_clis));
 	ao2_t_ref(tps_singletons, -1, "Unref tps_singletons in shutdown");
+	tps_singletons = NULL;
 }
 
 /* initialize the taskprocessor container and register CLI operations */