[asterisk-commits] mmichelson: branch group/CCSS r220375 - /team/group/CCSS/main/ccss.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Sep 24 16:09:49 2009
New Revision: 220375

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=220375
Log:
Call tech-specific destructors before destroying other general
items in case the destructors want to make use of them.


Modified:
    team/group/CCSS/main/ccss.c

Modified: team/group/CCSS/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/main/ccss.c?view=diff&rev=220375&r1=220374&r2=220375
==============================================================================
--- team/group/CCSS/main/ccss.c (original)
+++ team/group/CCSS/main/ccss.c Thu Sep 24 16:09:49 2009
@@ -639,8 +639,8 @@
 }
 
 static void agent_destroy(struct ast_cc_agent *agent) {
+	agent->callbacks->destructor(agent);
 	agent->interface_tree = cc_unref(agent->interface_tree, "Destroying agent, removing ref to interface tree");
-	agent->callbacks->destructor(agent);
 	ast_free(agent);
 }
 
@@ -894,8 +894,8 @@
 static void monitor_destroy(void *data)
 {
 	struct ast_cc_monitor *monitor = data;
+	monitor->callbacks->destructor(monitor);
 	ao2_ref(monitor->interface, -1);
-	monitor->callbacks->destructor(monitor);
 }
 
 static struct ast_cc_monitor *cc_monitor_instance_init(struct ast_cc_interface *cc_interface,