hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only call destroyInstance for valid instances

Browse Source 
If the router of filter failed to create an instance, destroyInstance
should not be called.
This commit is contained in:
Markus Makela
2016-11-24 02:49:08 +02:00
parent d9642dd5ae
commit 221f2f79f0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/service.c
View File

@ -1889,7 +1889,7 @@ void service_shutdown()
{ {
svc->svc_do_shutdown = true; svc->svc_do_shutdown = true;
/* Call destroyInstance hook for routers */ /* Call destroyInstance hook for routers */
if (svc->router->destroyInstance) if (svc->router->destroyInstance && svc->router_instance)
{ {
svc->router->destroyInstance(svc->router_instance); svc->router->destroyInstance(svc->router_instance);
} }
@ -1898,7 +1898,7 @@ void service_shutdown()
FILTER_DEF **filters = svc->filters; FILTER_DEF **filters = svc->filters;
for (int i=0; i < svc->n_filters; i++) for (int i=0; i < svc->n_filters; i++)
{ {
if (filters[i]->obj->destroyInstance) if (filters[i]->obj->destroyInstance && filters[i]->filter)
{ {
/* Call destroyInstance hook for filters */ /* Call destroyInstance hook for filters */
filters[i]->obj->destroyInstance(filters[i]->filter); filters[i]->obj->destroyInstance(filters[i]->filter);