[asterisk-commits] irroot: branch irroot/distrotech-customers-trunk r335490 - in /team/irroot/di...

[SVN commits to the Asterisk project]

Author: irroot
Date: Mon Sep 12 15:10:08 2011
New Revision: 335490

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=335490
Log:
Changes to RB1402 unintended edit, Add Lock back

Modified:
    team/irroot/distrotech-customers-trunk/   (props changed)
    team/irroot/distrotech-customers-trunk/apps/app_queue.c

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Sep 12 15:10:08 2011
@@ -1,1 +1,1 @@
-/trunk:1-335061
+/trunk:1-334969

Modified: team/irroot/distrotech-customers-trunk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/apps/app_queue.c?view=diff&rev=335490&r1=335489&r2=335490
==============================================================================
--- team/irroot/distrotech-customers-trunk/apps/app_queue.c (original)
+++ team/irroot/distrotech-customers-trunk/apps/app_queue.c Mon Sep 12 15:10:08 2011
@@ -2460,7 +2460,8 @@
 	struct ao2_iterator mem_iter;
 
 	if (!(member_config = ast_load_realtime_multientry("queue_members", "interface LIKE", "%", "queue_name", q->name , SENTINEL))) {
-		/*This queue doesn't have realtime members*/		ast_debug(3, "Queue %s has no realtime members defined. No need for update\n", q->name);
+		/*This queue doesn't have realtime members*/
+		ast_debug(3, "Queue %s has no realtime members defined. No need for update\n", q->name);
 		return;
 	}
 
@@ -7126,6 +7127,7 @@
 	}
 
 	queue_iter = ao2_iterator_init(queues, AO2_ITERATOR_DONTLOCK);
+	ao2_lock(queues);
 	while ((q = ao2_t_iterator_next(&queue_iter, "Iterate through queues"))) {
 		float sl;
 		struct call_queue *realtime_queue = NULL;
@@ -7216,6 +7218,7 @@
 		queue_t_unref(q, "Done with iterator"); /* Unref the iterator's reference */
 	}
 	ao2_iterator_destroy(&queue_iter);
+	ao2_lock(queues);
 	if (!found) {
 		if (argc == 3)
 			ast_str_set(&out, 0, "No such queue: %s.", argv[2]);