FS-6095 --resolve modified to protect against memory leak and make it more consistant...

diff --git a/src/mod/applications/mod_callcenter/mod_callcenter.c b/src/mod/applications/mod_callcenter/mod_callcenter.c
index 07449411f06dd0832895f043f13f2868e5392c70..ab386f8ecd1da1e26e1c4a9804eb99f51a1f75c8 100644 (file)
--- a/src/mod/applications/mod_callcenter/mod_callcenter.c
+++ b/src/mod/applications/mod_callcenter/mod_callcenter.c
@@ -661,11 +661,17 @@ static cc_queue_t *load_queue(const char *queue_name)
        cc_queue_t *queue = NULL;
        switch_xml_t x_queues, x_queue, cfg, xml;
        switch_event_t *event = NULL;
+       switch_event_t *params = NULL;
 
-       if (!(xml = switch_xml_open_cfg(global_cf, &cfg, NULL))) {
+       switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS);
+       switch_assert(params);
+       switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "CC-Queue", queue_name);
+
+       if (!(xml = switch_xml_open_cfg(global_cf, &cfg, params))) {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", global_cf);
-               return queue;
+               goto end;
        }
+
        if (!(x_queues = switch_xml_child(cfg, "queues"))) {
                goto end;
        }
@@ -717,6 +723,9 @@ end:
        if (event) {
                switch_event_destroy(&event);
        }
+       if (params) {
+               switch_event_destroy(&params);
+       }
        return queue;
 }