Merged 1.8.9.0-rc2 blockers

git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.8.9.0-rc2@350606 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2012-01-13 17:48:23 +00:00
parent e8e410a260
commit ab5779c1bd
3 changed files with 18 additions and 4 deletions

View File

@@ -1 +1 @@
1.8.9.0-rc1 1.8.9.0-rc2

View File

@@ -1,3 +1,18 @@
2012-01-13 Asterisk Development Team <asteriskteam@digium.com>
* Asterisk 1.8.9.0-rc2 Released.
* Test results:
http://bamboo.asterisk.org/browse/TESTING-ASTERISK1890RCS-3
* apps/app_queue.c: Realtime queues failed to load queue
information without queue member table. Revision 342223
broke this when it changed the return value for
realtime_multientry to return NULL when no results are
returned. (closes issue ASTERISK-19170) Reported by: Rene
Mendoza Tested by: Rene Mendoza
2011-12-30 Asterisk Development Team <asteriskteam@digium.com> 2011-12-30 Asterisk Development Team <asteriskteam@digium.com>
* Asterisk 1.8.9.0-rc1 Released. * Asterisk 1.8.9.0-rc1 Released.

View File

@@ -2346,9 +2346,8 @@ static struct call_queue *load_realtime_queue(const char *queuename)
if (queue_vars) { if (queue_vars) {
member_config = ast_load_realtime_multientry("queue_members", "interface LIKE", "%", "queue_name", queuename, SENTINEL); member_config = ast_load_realtime_multientry("queue_members", "interface LIKE", "%", "queue_name", queuename, SENTINEL);
if (!member_config) { if (!member_config) {
ast_log(LOG_ERROR, "no queue_members defined in your config (extconfig.conf).\n"); ast_debug(1, "No queue_members defined in config extconfig.conf\n");
ast_variables_destroy(queue_vars); member_config = ast_config_new();
return NULL;
} }
} }
if (q) { if (q) {