From b0d337d2cb8b523c88e42776b3671bc6c164d06c Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Wed, 15 Aug 2012 23:10:11 +0000 Subject: [PATCH] Fix bug where final queue member would not be removed from memory. If a static queue had realtime members, then there could be a potential for those realtime members not to be properly deleted from memory. If the queue's members were loaded from realtime and then all the members were deleted from the backend, then the queue would still think these members existed. The reason was that there was a short- circuit in code such that if there were no members found in the backend, then the queue would not be updated to reflect this. Note that this only affected static queues with realtime members. Realtime queues with realtime members were unaffected by this issue. (closes issue ASTERISK-19793) reported by Marcus Haas git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@371306 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_queue.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/apps/app_queue.c b/apps/app_queue.c index 476aaa4f18..af0a972b44 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -2408,8 +2408,19 @@ static void update_realtime_members(struct call_queue *q) struct ao2_iterator mem_iter; if (!(member_config = ast_load_realtime_multientry("queue_members", "interface LIKE", "%", "queue_name", q->name , SENTINEL))) { - /*This queue doesn't have realtime members*/ + /* This queue doesn't have realtime members. If the queue still has any realtime + * members in memory, they need to be removed. + */ + ao2_lock(q); + mem_iter = ao2_iterator_init(q->members, 0); + while ((m = ao2_iterator_next(&mem_iter))) { + if (m->realtime) { + ao2_unlink(q->members, m); + } + ao2_ref(m, -1); + } ast_debug(3, "Queue %s has no realtime members defined. No need for update\n", q->name); + ao2_unlock(q); return; }