[asterisk-commits] jrose: branch certified-1.8.15 r376303 - in /certified/branches/1.8.15: ./ apps/

[SVN commits to the Asterisk project]

Author: jrose
Date: Thu Nov 15 15:53:42 2012
New Revision: 376303

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=376303
Log:
merging r376302 from 1.8.11 certified

 r376302 | jrose | 2012-11-15 15:48:33 -0600 (Thu, 15 Nov 2012) | 9 lines

 app_queue: Fix a deadlock caused by a mistake from merging r375591

 (closes issue AST-1035)
 Reported by: Steve Pitts
 Patches:
     certified_1.8.11_oops_missed_an_unlock.diff uploaded by Jonathan Rose (license 6182)


Modified:
    certified/branches/1.8.15/   (props changed)
    certified/branches/1.8.15/apps/app_queue.c

Propchange: certified/branches/1.8.15/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 15 15:53:42 2012
@@ -1,1 +1,2 @@
 /branches/1.8:371919
+/certified/branches/1.8.11:376302

Modified: certified/branches/1.8.15/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/certified/branches/1.8.15/apps/app_queue.c?view=diff&rev=376303&r1=376302&r2=376303
==============================================================================
--- certified/branches/1.8.15/apps/app_queue.c (original)
+++ certified/branches/1.8.15/apps/app_queue.c Thu Nov 15 15:53:42 2012
@@ -2509,6 +2509,7 @@
 			ao2_ref(m, -1);
 		}
 		ast_debug(3, "Queue %s has no realtime members defined. No need for update\n", q->name);
+		ao2_unlock(q);
 		return;
 	}