From: Mark Michelson <mmichelson@digium.com>
Date: Wed, 12 Sep 2007 14:29:15 +0000 (+0000)
Subject: Merged revisions 82274 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~1450
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8cd1f2effc7cc602b58bb5c087fba49d41cdaa50;p=thirdparty%2Fasterisk.git

Merged revisions 82274 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r82274 | mmichelson | 2007-09-12 09:24:53 -0500 (Wed, 12 Sep 2007) | 6 lines

We should only initialize a realtime queue when it is allocated, not every time we access it. This prevents the members ao2_container
from being reallocated every time the queue is accessed.

I also removed a debug message I had accidentally left in on a previous commit.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82275 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_queue.c b/apps/app_queue.c
index dd2eb7f9aa..cb5b9b1069 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -1206,9 +1206,9 @@ static struct call_queue *find_queue_by_name_rt(const char *queuename, struct as
 		ast_mutex_lock(&q->lock);
 		clear_queue(q);
 		q->realtime = 1;
+		init_queue(q);		/* Ensure defaults for all parameters not set explicitly. */
 		AST_LIST_INSERT_HEAD(&queues, q, list);
 	}
-	init_queue(q);		/* Ensure defaults for all parameters not set explicitly. */
 
 	memset(tmpbuf, 0, sizeof(tmpbuf));
 	for (v = queue_vars; v; v = v->next) {