Merge branch '2.3' into develop

2019-05-09 14:35:44 +03:00
parent 0423c5528e 567ad9b8b8
commit 381940ce8c
3 changed files with 38 additions and 32 deletions
--- a/server/modules/routing/avrorouter/avro_client.cc
+++ b/server/modules/routing/avrorouter/avro_client.cc
@ -243,7 +243,7 @@ bool file_in_dir(const char* dir, const char* file)
 */
 void AvroSession::queue_client_callback()
 {
-    auto worker = mxs::RoutingWorker::get(mxs::RoutingWorker::MAIN);
+    auto worker = static_cast<mxs::RoutingWorker*>(dcb->owner);
    worker->execute([this]() {
                        client_callback();
                    }, mxs::RoutingWorker::EXECUTE_QUEUED);