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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Johan Wikman
2019-11-29 13:59:16 +02:00
parent 19db46b1d3 d41975dde8
commit d45ea8d489
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/routingworker.cc
View File

@ -466,9 +466,9 @@ RoutingWorker* RoutingWorker::get(int worker_id)
worker_id = this_unit.id_main_worker; worker_id = this_unit.id_main_worker;
} }
mxb_assert((worker_id >= this_unit.id_min_worker) && (worker_id <= this_unit.id_max_worker)); bool valid = (worker_id >= this_unit.id_min_worker && worker_id <= this_unit.id_max_worker);
return this_unit.ppWorkers[worker_id]; return valid ? this_unit.ppWorkers[worker_id] : nullptr;
} }
RoutingWorker* RoutingWorker::get_current() RoutingWorker* RoutingWorker::get_current()