[asterisk-commits] dlee: branch dlee/ASTERISK-22243 r396274 - /team/dlee/ASTERISK-22243/main/

[SVN commits to the Asterisk project]

Author: dlee
Date: Mon Aug  5 16:07:14 2013
New Revision: 396274

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=396274
Log:
Fix graceful shutdown order bug

Modified:
    team/dlee/ASTERISK-22243/main/stasis_channels.c

Modified: team/dlee/ASTERISK-22243/main/stasis_channels.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22243/main/stasis_channels.c?view=diff&rev=396274&r1=396273&r2=396274
==============================================================================
--- team/dlee/ASTERISK-22243/main/stasis_channels.c (original)
+++ team/dlee/ASTERISK-22243/main/stasis_channels.c Mon Aug  5 16:07:14 2013
@@ -912,6 +912,13 @@
 
 static void stasis_channels_cleanup(void)
 {
+	stasis_caching_unsubscribe_and_join(channel_by_name_topic);
+	channel_by_name_topic = NULL;
+	ao2_cleanup(channel_cache_by_name);
+	channel_cache_by_name = NULL;
+	ao2_cleanup(channel_cache_all);
+	channel_cache_all = NULL;
+
 	STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_snapshot_type);
 	STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_dial_type);
 	STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_varset_type);
@@ -931,13 +938,6 @@
 	STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_monitor_stop_type);
 	STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_agent_login_type);
 	STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_agent_logoff_type);
-
-	stasis_caching_unsubscribe_and_join(channel_by_name_topic);
-	channel_by_name_topic = NULL;
-	ao2_cleanup(channel_cache_by_name);
-	channel_cache_by_name = NULL;
-	ao2_cleanup(channel_cache_all);
-	channel_cache_all = NULL;
 }
 
 int ast_stasis_channels_init(void)