Merge branch '2.3' into develop

2019-02-07 10:50:27 +02:00
parent 934be45b68 b560a67e54
commit 42b5c39f43
12 changed files with 85 additions and 47 deletions
--- a/include/maxscale/router.hh
+++ b/include/maxscale/router.hh
@ -420,7 +420,7 @@ public:
    static MXS_ROUTER_SESSION* newSession(MXS_ROUTER* pInstance, MXS_SESSION* pSession)
    {
        RouterType* pRouter = static_cast<RouterType*>(pInstance);
-        RouterSessionType* pRouter_session;
+        RouterSessionType* pRouter_session = nullptr;

        MXS_EXCEPTION_GUARD(pRouter_session = pRouter->newSession(pSession));