Merge branch '2.3' into develop

2019-04-01 11:31:49 +03:00
parent 4276514e27 738ae9178b
commit e659c6cc73
15 changed files with 200 additions and 73 deletions
--- a/server/core/service.cc
+++ b/server/core/service.cc
@ -111,12 +111,12 @@ Service* service_alloc(const char* name, const char* router, MXS_CONFIG_PARAMETE
        dcb_enable_session_timeouts();
    }

-    // Store router, used when service is serialized
-    service_add_parameter(service, CN_ROUTER, router);
-
    // Store parameters in the service
    service_add_parameters(service, params);

+    // Store router, used when service is serialized
+    service_replace_parameter(service, CN_ROUTER, router);
+
    service->router_instance = router_api->createInstance(service, params);

    if (service->router_instance == NULL)