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

Fix bugs.

Browse Source
This commit is contained in:
counterpoint
2015-05-27 16:56:53 +01:00
parent 23e9a7b4e2
commit e5b4984a12
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
server/core/dcb.c
View File

@ -1311,25 +1311,27 @@ dcb_close(DCB *dcb)
dcb->session = NULL;
spinlock_release(&dcb->server->persistlock);
atomic_add(&dcb->server->stats.n_persistent, 1);
spinlock_acquire(&dcb->session->ses_lock);
/**
* If session->state is STOPPING, start closing client session.
* Otherwise only this backend connection is closed.
*/
if (session != NULL &&
session->state == SESSION_STATE_STOPPING &&
session->client != NULL &&
session->client->state == DCB_STATE_POLLING)
if (dcb->session)
{
spinlock_release(&session->ses_lock);
spinlock_acquire(&dcb->session->ses_lock);
/**
* If session->state is STOPPING, start closing client session.
* Otherwise only this backend connection is closed.
*/
if (dcb->session->state == SESSION_STATE_STOPPING &&
dcb->session->client != NULL &&
dcb->session->client->state == DCB_STATE_POLLING)
{
spinlock_release(&dcb->session->ses_lock);
/** Close client DCB */
dcb_close(session->client);
/** Close client DCB */
dcb_close(dcb->session->client);
}
else
{
spinlock_release(&dcb->session->ses_lock);
}
}
else
{
spinlock_release(&session->ses_lock);
}
return;
}