Merge branch '2.3' into 2.4

This commit is contained in:
Markus Mäkelä
2019-10-10 21:42:43 +03:00
12 changed files with 854 additions and 231 deletions

View File

@ -1419,13 +1419,15 @@ static void worker_func(int thread_id, void* data)
for (TargetList::iterator it = info->targets.begin();
it != info->targets.end(); it++)
{
LocalClient* client = LocalClient::create(&info->session, &info->protocol, it->first);
GWBUF* buffer = modutil_create_query(it->second.c_str());
client->queue_query(buffer);
gwbuf_free(buffer);
if (LocalClient* client = LocalClient::create(&info->session, &info->protocol, it->first))
{
GWBUF* buffer = modutil_create_query(it->second.c_str());
client->queue_query(buffer);
gwbuf_free(buffer);
// The LocalClient needs to delete itself once the queries are done
client->self_destruct();
// The LocalClient needs to delete itself once the queries are done
client->self_destruct();
}
}
delete info;