[asterisk-commits] nadi: trunk r44922 - in /trunk: ./ main/manager.c

[asterisk-commits at lists.digium.com]

Author: nadi
Date: Thu Oct 12 08:04:03 2006
New Revision: 44922

URL: http://svn.digium.com/view/asterisk?rev=44922&view=rev
Log:
Merged revisions 44921 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44921 | nadi | 2006-10-12 14:55:25 +0200 (Do, 12 Okt 2006) | 2 lines

append_event must be called while holding the session lock

........

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

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

Modified: trunk/main/manager.c
URL: http://svn.digium.com/view/asterisk/trunk/main/manager.c?rev=44922&r1=44921&r2=44922&view=diff
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Thu Oct 12 08:04:03 2006
@@ -2234,10 +2234,9 @@
 	
 	ast_dynamic_str_thread_append(&buf, 0, &manager_event_buf, "\r\n");	
 	
-	append_event(buf->str, category);
-	
 	/* Append even to master list and wake up any sleeping sessions */
 	AST_LIST_LOCK(&sessions);
+	append_event(buf->str, category);
 	AST_LIST_TRAVERSE(&sessions, s, list) {
 		ast_mutex_lock(&s->__lock);
 		if (s->waiting_thread != AST_PTHREADT_NULL)