[asterisk-commits] dlee: trunk r389454 - /trunk/main/stasis_bridging.c

[SVN commits to the Asterisk project]

Author: dlee
Date: Tue May 21 17:49:23 2013
New Revision: 389454

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=389454
Log:
Fix destruction order assert for stasis_bridging

Modified:
    trunk/main/stasis_bridging.c

Modified: trunk/main/stasis_bridging.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/stasis_bridging.c?view=diff&rev=389454&r1=389453&r2=389454
==============================================================================
--- trunk/main/stasis_bridging.c (original)
+++ trunk/main/stasis_bridging.c Tue May 21 17:49:23 2013
@@ -321,15 +321,17 @@
 
 void ast_stasis_bridging_shutdown(void)
 {
+	ao2_cleanup(bridge_topic_all);
+	bridge_topic_all = NULL;
+	bridge_topic_all_cached = stasis_caching_unsubscribe_and_join(
+		bridge_topic_all_cached);
+	ao2_cleanup(bridge_topic_pool);
+	bridge_topic_pool = NULL;
+
 	STASIS_MESSAGE_TYPE_CLEANUP(ast_bridge_snapshot_type);
 	STASIS_MESSAGE_TYPE_CLEANUP(ast_bridge_merge_message_type);
 	STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_entered_bridge_type);
 	STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_left_bridge_type);
-	ao2_cleanup(bridge_topic_all);
-	bridge_topic_all = NULL;
-	bridge_topic_all_cached = stasis_caching_unsubscribe(bridge_topic_all_cached);
-	ao2_cleanup(bridge_topic_pool);
-	bridge_topic_pool = NULL;
 }
 
 /*! \brief snapshot ID getter for caching topic */