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

Fix to Coverity issue 84943

Browse Source
This commit is contained in:
VilhoRaatikka
2014-12-19 11:35:17 +02:00
parent 552d3186eb
commit 55447919ce
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -4311,12 +4311,6 @@ static void handleError (
CHK_DCB(backend_dcb); CHK_DCB(backend_dcb);
if (!rses_begin_locked_router_action(rses))
{
*succp = false;
return;
}
/** Don't handle same error twice on same DCB */ /** Don't handle same error twice on same DCB */
if (backend_dcb->dcb_errhandle_called) if (backend_dcb->dcb_errhandle_called)
{ {
@ -4341,7 +4335,14 @@ static void handleError (
switch (action) { switch (action) {
case ERRACT_NEW_CONNECTION: case ERRACT_NEW_CONNECTION:
{ {
SERVER* srv = rses->rses_master_ref->bref_backend->backend_server; SERVER* srv;
if (!rses_begin_locked_router_action(rses))
{
*succp = false;
return;
}
srv = rses->rses_master_ref->bref_backend->backend_server;
/** /**
* If master has lost its Master status error can't be * If master has lost its Master status error can't be
* handled so that session could continue. * handled so that session could continue.
@ -4380,7 +4381,6 @@ static void handleError (
case ERRACT_REPLY_CLIENT: case ERRACT_REPLY_CLIENT:
{ {
rses_end_locked_router_action(rses);
handle_error_reply_client(session, handle_error_reply_client(session,
rses, rses,
backend_dcb, backend_dcb,
@ -4390,7 +4390,6 @@ static void handleError (
} }
default: default:
rses_end_locked_router_action(rses);
*succp = false; *succp = false;
break; break;
} }