automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43887 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_queue.c b/apps/app_queue.c
index a10b2ad0817c9360c8b02ea980034035cced4e31..5d46a8df10cb9c256e5d6b506cdded3468cb51ba 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -432,11 +432,12 @@ enum queue_member_status {
        QUEUE_NORMAL
 };
 
-static enum queue_member_status get_member_status(const struct call_queue *q)
+static enum queue_member_status get_member_status(struct call_queue *q)
 {
        struct member *member;
        enum queue_member_status result = QUEUE_NO_MEMBERS;
 
+       ast_mutex_lock(&q->lock);
        for (member = q->members; member; member = member->next) {
                if (member->paused) continue;
 
@@ -448,10 +449,12 @@ static enum queue_member_status get_member_status(const struct call_queue *q)
                        result = QUEUE_NO_REACHABLE_MEMBERS;
                        break;
                default:
+                       ast_mutex_unlock(&q->lock);
                        return QUEUE_NORMAL;
                }
        }
        
+       ast_mutex_unlock(&q->lock);
        return result;
 }