summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2007-08-31 19:50:26 +0000
committerMark Michelson <mmichelson@digium.com>2007-08-31 19:50:26 +0000
commita748fc664796a31f47922693c3849fa7970786b2 (patch)
tree40fa5921afa76dc4277a66591b612440e6081d84 /apps
parent836c550ce3a88f1c4b589451f77c34e2d60de56c (diff)
Merged revisions 81416 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r81416 | mmichelson | 2007-08-31 14:48:55 -0500 (Fri, 31 Aug 2007) | 6 lines Fixed broken behavior of a reload on realtime queues. Prior to this patch, if a reload was issued and a realtime queue had callers waiting in it, then the queue would be removed from the queue list, but it would not actually be freed (in fact, a debug message warning about a memory leak would come up). With this patch, reloads do not touch realtime queues at all. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81417 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rw-r--r--apps/app_queue.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index df2128689..5e469aa32 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -4003,8 +4003,10 @@ static int reload_queues(int reload)
AST_LIST_LOCK(&queues);
use_weight=0;
/* Mark all queues as dead for the moment */
- AST_LIST_TRAVERSE(&queues, q, list)
- q->dead = 1;
+ AST_LIST_TRAVERSE(&queues, q, list) {
+ if(!q->realtime)
+ q->dead = 1;
+ }
/* Chug through config file */
cat = NULL;