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

Clean up modifications.

Browse Source
This commit is contained in:
counterpoint
2015-06-01 14:05:31 +01:00
parent e5b4984a12
commit 739ea82e36
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/core/dcb.c
View File

@ -1306,6 +1306,7 @@ dcb_close(DCB *dcb)
if (poll_remove_dcb(dcb)) if (poll_remove_dcb(dcb))
{ {
/* Error */ /* Error */
spinlock_release(&dcb->server->persistlock);
return; return;
} }
dcb->session = NULL; dcb->session = NULL;

20
server/core/server.c
View File

@ -158,20 +158,12 @@ server_get_persistent(SERVER *server, char *user, const char *protocol)
{ {
previous->nextpersistent = dcb->nextpersistent; previous->nextpersistent = dcb->nextpersistent;
} }
rc = 0; /* poll_add_dcb(dcb); */ free(dcb->user);
if (rc == DCBFD_CLOSED) { dcb->user = NULL;
dcb_set_state(dcb, DCB_STATE_DISCONNECTED, NULL); spinlock_release(&server->persistlock);
dcb_free(dcb); atomic_add(&server->stats.n_persistent, -1);
} atomic_add(&server->stats.n_current, 1);
else return dcb;
{
free(dcb->user);
dcb->user = NULL;
spinlock_release(&server->persistlock);
atomic_add(&server->stats.n_persistent, -1);
atomic_add(&server->stats.n_current, 1);
return dcb;
}
} }
previous = dcb; previous = dcb;
dcb = dcb->nextpersistent; dcb = dcb->nextpersistent;