[asterisk-commits] mmichelson: trunk r81011 - in /trunk: ./ apps/app_queue.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Aug 27 09:56:50 2007
New Revision: 81011

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

........
r81010 | mmichelson | 2007-08-27 09:55:44 -0500 (Mon, 27 Aug 2007) | 3 lines

Found a case where the queue's membercount is off. It does not take into account dynamic members on a reload.


........

Modified:
    trunk/   (props changed)
    trunk/apps/app_queue.c

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

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?view=diff&rev=81011&r1=81010&r2=81011
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Mon Aug 27 09:56:50 2007
@@ -4115,8 +4115,11 @@
 				ast_debug(1, "XXX Leaking a little memory :( XXX\n");
 		} else {
 			ast_mutex_lock(&q->lock);
-			for (cur = q->members; cur; cur = cur->next)
+			for (cur = q->members; cur; cur = cur->next) {
+				if(cur->dynamic)
+					q->membercount++;
 				cur->status = ast_device_state(cur->interface);
+			}
 			ast_mutex_unlock(&q->lock);
 		}
 	}