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

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri Sep 11 14:45:54 2009
New Revision: 218097

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=218097
Log:
Ensure that when pruning links we never end up destroying
the root monitor.


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

Modified: team/group/CCSS/main/ccss.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/CCSS/main/ccss.c?view=diff&rev=218097&r1=218096&r2=218097
==============================================================================
--- team/group/CCSS/main/ccss.c (original)
+++ team/group/CCSS/main/ccss.c Fri Sep 11 14:45:54 2009
@@ -986,6 +986,12 @@
 
 	if (link_parent) {
 		AST_LIST_REMOVE(&monitor->parent_links, link_parent, next_parent);
+	}
+	if (monitor->monitor_class == AST_CC_ROOT_MONITOR) {
+		/* Never ever under any circumstances unlink
+		 * the root monitor
+		 */
+		return;
 	}
 	if (AST_LIST_EMPTY(&monitor->parent_links) &&
 			AST_LIST_EMPTY(&monitor->child_links)) {