[svn-commits] mmichelson: branch group/CCSS r220317 - /team/group/CCSS/main/ccss.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Sep 24 15:22:57 2009
New Revision: 220317

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=220317
Log:
NULL out saved link if we destroy it.

Also remove some more useless debugging crap.


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=220317&r1=220316&r2=220317
==============================================================================
--- team/group/CCSS/main/ccss.c (original)
+++ team/group/CCSS/main/ccss.c Thu Sep 24 15:22:57 2009
@@ -1042,6 +1042,11 @@
 		ast_log(LOG_NOTICE, "Removing parent link from monitor %s\n", monitor->interface->name);
 		AST_LIST_REMOVE(&monitor->parent_links, link_parent, next_parent);
 	}
+
+	if (monitor->saved_link == link_parent) {
+		monitor->saved_link == NULL;
+	}
+
 	if (monitor->interface->monitor_class == AST_CC_ROOT_MONITOR) {
 		/* Never ever under any circumstances unlink
 		 * the root monitor
@@ -1056,12 +1061,6 @@
 		 */
 		ast_log(LOG_NOTICE, "Unlinking monitor %s\n", monitor->interface->name);
 		ao2_t_unlink(cc_monitors, monitor, "Unlink monitor since nothing refers to it anymore");
-	} else {
-		if (!AST_LIST_EMPTY(&monitor->parent_links)) {
-			ast_log(LOG_NOTICE, "Not unlinking %s because it has parent links, still\n", monitor->interface->name);
-		} else {
-			ast_log(LOG_NOTICE, "Not unlinking %s because it has child links, stil\n", monitor->interface->name);
-		}
 	}
 }