[asterisk-commits] mjordan: trunk r391040 - /trunk/main/app.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Sun Jun  9 16:11:25 2013
New Revision: 391040

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=391040
Log:
Clean up MWI topic pool before message type destruction

Topics need to be disposed of prior to the message types that are published
on them. This includes topic pools. This prevents an assertion from being
raised on shutdown.

Modified:
    trunk/main/app.c

Modified: trunk/main/app.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/app.c?view=diff&rev=391040&r1=391039&r2=391040
==============================================================================
--- trunk/main/app.c (original)
+++ trunk/main/app.c Sun Jun  9 16:11:25 2013
@@ -2818,13 +2818,13 @@
 
 static void app_cleanup(void)
 {
+	ao2_cleanup(mwi_topic_pool);
+	mwi_topic_pool = NULL;
 	ao2_cleanup(mwi_topic_all);
 	mwi_topic_all = NULL;
 	mwi_topic_cached = stasis_caching_unsubscribe_and_join(mwi_topic_cached);
 	STASIS_MESSAGE_TYPE_CLEANUP(ast_mwi_state_type);
 	STASIS_MESSAGE_TYPE_CLEANUP(ast_mwi_vm_app_type);
-	ao2_cleanup(mwi_topic_pool);
-	mwi_topic_pool = NULL;
 }
 
 int app_init(void)