[asterisk-commits] mjordan: branch mjordan/trunk-astdb-cluster r433004 - /team/mjordan/trunk-ast...

[SVN commits to the Asterisk project]

Author: mjordan
Date: Tue Mar 17 07:04:01 2015
New Revision: 433004

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=433004
Log:
Clean up shutdown FRACK

Modified:
    team/mjordan/trunk-astdb-cluster/main/db.c

Modified: team/mjordan/trunk-astdb-cluster/main/db.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/trunk-astdb-cluster/main/db.c?view=diff&rev=433004&r1=433003&r2=433004
==============================================================================
--- team/mjordan/trunk-astdb-cluster/main/db.c (original)
+++ team/mjordan/trunk-astdb-cluster/main/db.c Tue Mar 17 07:04:01 2015
@@ -1595,7 +1595,7 @@
 	ast_manager_unregister("DBDel");
 	ast_manager_unregister("DBDelTree");
 
-	ao2_ref(message_router, -1);
+	stasis_message_router_unsubscribe_and_join(message_router);
 	message_router = NULL;
 	ao2_ref(db_cluster_topic, -1);
 	db_cluster_topic = NULL;
@@ -1701,7 +1701,7 @@
 	return 0;
 
 error_cleanup:
-	ao2_cleanup(message_router);
+	stasis_message_router_unsubscribe_and_join(message_router);
 	ao2_cleanup(db_cluster_topic);
 	STASIS_MESSAGE_TYPE_CLEANUP(ast_db_put_shared_type);
 	STASIS_MESSAGE_TYPE_CLEANUP(ast_db_del_shared_type);