Re-add taskprocessor cleanup code that was removed by the UUID merge.
authorMark Michelson <mmichelson@digium.com>
Thu, 13 Dec 2012 15:40:03 +0000 (15:40 +0000)
committerMark Michelson <mmichelson@digium.com>
Thu, 13 Dec 2012 15:40:03 +0000 (15:40 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377975 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/taskprocessor.c

index 912f891..d8f1af3 100644 (file)
@@ -122,10 +122,15 @@ static struct ast_cli_entry taskprocessor_clis[] = {
        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 */