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

MXS-1913: Check session before invoking dcb_foreach callback

Browse Source 
If the session is the dummy session, the callback should not be called.
This commit is contained in:
Markus Mäkelä
2018-06-12 09:31:24 +03:00
parent d9100278b0
commit 24870e278c
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/core/dcb.cc
View File

@ -2909,10 +2909,15 @@ public:
dcb && atomic_load_int32(&m_more); dcb && atomic_load_int32(&m_more);
dcb = dcb->thread.next) dcb = dcb->thread.next)
{ {
if (!m_func(dcb, m_data)) ss_dassert(dcb->session);
if (dcb->session->state != SESSION_STATE_DUMMY)
{ {
atomic_store_int32(&m_more, 0); if (!m_func(dcb, m_data))
break; {
atomic_store_int32(&m_more, 0);
break;
}
} }
} }
} }