[asterisk-commits] irroot: trunk r342018 - in /trunk: ./ apps/app_queue.c

[SVN commits to the Asterisk project]

Author: irroot
Date: Mon Oct 24 02:40:18 2011
New Revision: 342018

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=342018
Log:
queues container needs locking when using the OBJ_NOLOCK flag
........

Merged revisions 342017 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/apps/app_queue.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_queue.c?view=diff&rev=342018&r1=342017&r2=342018
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Mon Oct 24 02:40:18 2011
@@ -7054,6 +7054,9 @@
 		return -1;
 	}
 
+	/* We've made it here, so it looks like we're doing operations on all queues. */
+	ao2_lock(queues);
+
 	/* Mark all queues as dead for the moment if we're reloading queues.
 	 * For clarity, we could just be reloading members, in which case we don't want to mess
 	 * with the other queue parameters at all*/
@@ -7077,6 +7080,7 @@
 	if (queue_reload) {
 		ao2_callback(queues, OBJ_NODATA | OBJ_MULTIPLE | OBJ_UNLINK | OBJ_NOLOCK, kill_dead_queues, (char *) queuename);
 	}
+	ao2_unlock(queues);
 	return 0;
 }