[svn-commits] twilson: branch twilson/calendaring r164308 - /team/twilson/calendaring/main/

[SVN commits to the Digium repositories]

Author: twilson
Date: Mon Dec 15 11:20:17 2008
New Revision: 164308

URL: http://svn.digium.com/view/asterisk?view=rev&rev=164308
Log:
Go ahead and move this even though I'm probably going to change how I do the race condition avoidance anyway

Modified:
    team/twilson/calendaring/main/calendar.c

Modified: team/twilson/calendaring/main/calendar.c
URL: http://svn.digium.com/view/asterisk/team/twilson/calendaring/main/calendar.c?view=diff&rev=164308&r1=164307&r2=164308
==============================================================================
--- team/twilson/calendaring/main/calendar.c (original)
+++ team/twilson/calendaring/main/calendar.c Mon Dec 15 11:20:17 2008
@@ -277,13 +277,14 @@
 
 	ao2_lock(event);
 	ast_debug(3, "Destroying event for calendar '%s'\n", event->owner->name);
-	ast_string_field_free_memory(event);
 
 	while (event->notify_sched > -1 && ast_sched_del(sched, event->notify_sched)) {
 		ao2_unlock(event);
 		usleep(1);
 		ao2_lock(event);
 	}
+	
+	ast_string_field_free_memory(event);
 
 	/* If an event is being deleted and we've fired an event changing the status at the beginning,
 	 * but haven't hit the end event yet, go ahead and set the devicestate to the current busy status */