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

Merge branch 'MXS-329-develop-20151111' into develop

Browse Source
This commit is contained in:
Markus Makela
2015-11-13 17:26:34 +02:00
parent b0c48c3f66 76856e6c90
commit 8d0bd8150a
57 changed files with 1654 additions and 1053 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/core/service.c
View File

@ -258,8 +258,7 @@ GWPROTOCOL *funcs;
}
if (loaded == -1)
{
hashtable_free(service->users->data);
free(service->users);
users_free(service->users);
service->users = NULL;
dcb_close(port->listener);
port->listener = NULL;
@ -347,6 +346,7 @@ GWPROTOCOL *funcs;
== NULL)
{
users_free(service->users);
service->users = NULL;
dcb_close(port->listener);
service->users = NULL;
port->listener = NULL;
@ -359,7 +359,6 @@ GWPROTOCOL *funcs;
goto retblock;
}
memcpy(&(port->listener->func), funcs, sizeof(GWPROTOCOL));
port->listener->session = NULL;
if (port->address)
sprintf(config_bind, "%s:%d", port->address, port->port);
@ -383,6 +382,7 @@ GWPROTOCOL *funcs;
service->name)));
users_free(service->users);
service->users = NULL;
dcb_close(port->listener);
port->listener = NULL;
service->users = NULL;