If all members are paused, the wrong status is indicated.

(closes issue #17576)
 Reported by: ramonpeek
 Patches: 
       diff.txt uploaded by ramonpeek (license 266)
 Tested by: ramonpeek


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@273639 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-07-02 15:46:27 +00:00
parent 2a18c6627d
commit 358159c2b0

View File

@@ -574,6 +574,7 @@ 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;
ao2_lock(q); ao2_lock(q);
mem_iter = ao2_iterator_init(q->members, 0); mem_iter = ao2_iterator_init(q->members, 0);
@@ -586,6 +587,8 @@ static enum queue_member_status get_member_status(struct call_queue *q, int max_
if (member->paused) { if (member->paused) {
ao2_ref(member, -1); ao2_ref(member, -1);
continue; continue;
} else {
allpaused = 0;
} }
switch (member->status) { switch (member->status) {
@@ -605,6 +608,10 @@ 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) {
result = QUEUE_NO_REACHABLE_MEMBERS;
}
return result; return result;
} }