[svn-commits] twilson: trunk r342382 - in /trunk: ./ apps/app_queue.c

[SVN commits to the Digium repositories]

Author: twilson
Date: Tue Oct 25 14:54:17 2011
New Revision: 342382

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=342382
Log:
Properly update membercount for reloaded members

Since q->membercount is set to 0 before reloading, it is important
to increment it again for reloaded members as well as added.

(closes issue AST-676)

Review: https://reviewboard.asterisk.org/r/1541/
........

Merged revisions 342380 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 342381 from http://svn.asterisk.org/svn/asterisk/branches/10

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

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

Modified: trunk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_queue.c?view=diff&rev=342382&r1=342381&r2=342382
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Tue Oct 25 14:54:17 2011
@@ -6869,9 +6869,12 @@
 
 	if (cur) {
 		ao2_ref(cur, -1);
-	} else {
-		q->membercount++;
-	}
+	}
+
+	/* Since this function is only called in a loop parsing all members after setting
+	 * q->membercount = 0 if we are reloading, we must increment the membercount whether
+	 * we add or reload, otherwise q->membercount stays 0 after a reload */
+	q->membercount++;
 }
 
 static int mark_member_dead(void *obj, void *arg, int flags)