Merged revisions 376302 from http://svn.asterisk.org/svn/asterisk/certified/branches...

........
  r376302 | jrose | 2012-11-15 15:48:33 -0600 (Thu, 15 Nov 2012) | 11 lines

  app_queue: Fix a lock that was being held forever caused by a merging mistake

  r375591 merged with conflicts and an oversight resulted in an unlock being
  missed which resulted in a deadlock when updating realtime members in queues.
  This patch adds that unlock back in.

  (closes issue AST-1035)
  Reported by: Steve Pitts
  Patches:
      certified_1.8.11_oops_missed_an_unlock.diff uploaded by Jonathan Rose (license 6182)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/certified/branches/1.8.15@376303 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 2727d8cf26f8b61de09da58d7a9082178a5f0e22..63f944999a68d5dbb3f87b82d480366e37feb4d8 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2509,6 +2509,7 @@ static void update_realtime_members(struct call_queue *q)
                        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;
        }