[svn-commits] dlee: branch dlee/playback-controls r389488 - in /team/dlee/playback-controls...

[SVN commits to the Digium repositories]

Author: dlee
Date: Wed May 22 10:59:04 2013
New Revision: 389488

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

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

Merged revisions 389487 from http://svn.asterisk.org/svn/asterisk/team/dlee/playback-rebase

Modified:
    team/dlee/playback-controls/   (props changed)
    team/dlee/playback-controls/main/stasis_bridging.c

Propchange: team/dlee/playback-controls/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed May 22 10:59:04 2013
@@ -1,1 +1,1 @@
-/team/dlee/playback-rebase:1-389449 /trunk:1-388896
+/team/dlee/playback-rebase:1-389487 /trunk:1-389486

Modified: team/dlee/playback-controls/main/stasis_bridging.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/playback-controls/main/stasis_bridging.c?view=diff&rev=389488&r1=389487&r2=389488
==============================================================================
--- team/dlee/playback-controls/main/stasis_bridging.c (original)
+++ team/dlee/playback-controls/main/stasis_bridging.c Wed May 22 10:59:04 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 */