From: Mark Michelson <mmichelson@digium.com>
Date: Thu, 13 Dec 2012 15:40:03 +0000 (+0000)
Subject: Re-add taskprocessor cleanup code that was removed by the UUID merge.
X-Git-Tag: 13.0.0-beta1~2273
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71b1e411b026aa14f0ad3cfeb4e8d7fcdc6a6ea7;p=thirdparty%2Fasterisk.git

Re-add taskprocessor cleanup code that was removed by the UUID merge.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377975 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/taskprocessor.c b/main/taskprocessor.c
index 912f891b17..d8f1af3e84 100644
--- a/main/taskprocessor.c
+++ b/main/taskprocessor.c
@@ -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 */