kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-19 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make get_member_status return QUEUE_NO_MEMBERS instead of QUEUE_NO_REACHABLE_MEMBERS to make joinempty=no work again. This regression was introduced in 273639. Also fixed whitespace.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@274093 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Nicholson
2010-07-06 13:52:28 +00:00
parent b0202ce6d1
commit 989ecebcb0
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/app_queue.c
View File

@@ -574,11 +574,13 @@ static enum queue_member_status get_member_status(struct call_queue *q, int max_
struct member *member; struct member *member;
struct ao2_iterator mem_iter; struct ao2_iterator mem_iter;
enum queue_member_status result = QUEUE_NO_MEMBERS; enum queue_member_status result = QUEUE_NO_MEMBERS;
int allpaused = 1; int allpaused = 1, empty = 1;
ao2_lock(q); ao2_lock(q);
mem_iter = ao2_iterator_init(q->members, 0); mem_iter = ao2_iterator_init(q->members, 0);
while ((member = ao2_iterator_next(&mem_iter))) { while ((member = ao2_iterator_next(&mem_iter))) {
empty = 0;
if (max_penalty && (member->penalty > max_penalty)) { if (max_penalty && (member->penalty > max_penalty)) {
ao2_ref(member, -1); ao2_ref(member, -1);
continue; continue;
@@ -609,9 +611,9 @@ static enum queue_member_status get_member_status(struct call_queue *q, int max_
ao2_iterator_destroy(&mem_iter); ao2_iterator_destroy(&mem_iter);
ao2_unlock(q); ao2_unlock(q);
if (allpaused) { if (!empty && allpaused) {
result = QUEUE_NO_REACHABLE_MEMBERS; result = QUEUE_NO_REACHABLE_MEMBERS;
} }
return result; return result;
} }