[asterisk-commits] mjordan: trunk r374302 - in /trunk: ./ main/ccss.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Wed Oct  3 12:27:53 2012
New Revision: 374302

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=374302
Log:
Destroy the generic_monitors container after the core_instances in ccss

For each item in core_instances disposed of in the shutdown of ccss, any
generic monitor instances referenced by the objecs will be removed from
generic_monitors during their destruction.  Hilarity ensues if
generic_monitors no longer exists.

Thanks to the Asterisk Test Suite's generic_ccss for complaining loudly when
it ran into this.
........

Merged revisions 374300 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 374301 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/main/ccss.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/ccss.c?view=diff&rev=374302&r1=374301&r2=374302
==============================================================================
--- trunk/main/ccss.c (original)
+++ trunk/main/ccss.c Wed Oct  3 12:27:53 2012
@@ -4535,13 +4535,14 @@
 	if (cc_core_taskprocessor) {
 		cc_core_taskprocessor = ast_taskprocessor_unreference(cc_core_taskprocessor);
 	}
+	/* Note that core instances must be destroyed prior to the generic_monitors */
+	if (cc_core_instances) {
+		ao2_t_ref(cc_core_instances, -1, "Unref cc_core_instances container in cc_shutdown");
+		cc_core_instances = NULL;
+	}
 	if (generic_monitors) {
 		ao2_t_ref(generic_monitors, -1, "Unref generic_monitor container in cc_shutdown");
 		generic_monitors = NULL;
-	}
-	if (cc_core_instances) {
-		ao2_t_ref(cc_core_instances, -1, "Unref cc_core_instances container in cc_shutdown");
-		cc_core_instances = NULL;
 	}
 }