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

[asterisk-commits at lists.digium.com]

Author: russell
Date: Tue Mar 14 12:30:52 2006
New Revision: 12926

URL: http://svn.digium.com/view/asterisk?rev=12926&view=rev
Log:
Merged revisions 12925 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r12925 | russell | 2006-03-14 13:28:39 -0500 (Tue, 14 Mar 2006) | 3 lines

fix a problem with not loading realtime queue members by always reloading a 
realtime queue from the database even if it is found in the list (issue #6680)

........

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

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

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?rev=12926&r1=12925&r2=12926&view=diff
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Tue Mar 14 12:30:52 2006
@@ -952,7 +952,7 @@
 	}
 	AST_LIST_UNLOCK(&queues);
 
-	if (!q) {
+	if (!q || q->realtime) {
 		/*! \note Load from realtime before taking the global qlock, to avoid blocking all
 		   queue operations while waiting for the DB.