[asterisk-commits] mmichelson: trunk r90899 - /trunk/apps/app_queue.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Dec  4 11:51:59 2007
New Revision: 90899

URL: http://svn.digium.com/view/asterisk?view=rev&rev=90899
Log:
Wrong locking style got merged from 1.4 to trunk. My mistake.


Modified:
    trunk/apps/app_queue.c

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?view=diff&rev=90899&r1=90898&r2=90899
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Tue Dec  4 11:51:59 2007
@@ -2818,9 +2818,9 @@
 		if (!datastore) {
 			if(!(datastore = ast_channel_datastore_alloc(&dialed_interface_info, NULL))) {
 				ao2_ref(cur, -1);
-				ast_mutex_unlock(&qe->parent->lock);
+				ao2_unlock(qe->parent);
 				if(use_weight)
-					AST_LIST_UNLOCK(&queues);
+					ao2_unlock(queues);
 				free(tmp);
 				goto out;
 			}
@@ -2843,9 +2843,9 @@
 			if(!(di = ast_calloc(1, sizeof(*di) + strlen(cur->interface)))) {
 				ao2_ref(cur, -1);
 				AST_LIST_UNLOCK(dialed_interfaces);
-				ast_mutex_unlock(&qe->parent->lock);
+				ao2_unlock(qe->parent);
 				if(use_weight)
-					AST_LIST_UNLOCK(&queues);
+					ao2_unlock(queues);
 				free(tmp);
 				goto out;
 			}