Merge branch '2.2' into develop

2018-09-12 22:14:56 +03:00
parent 12092d1a90 e1f2b81734
commit 7ec2f77708
21 changed files with 254 additions and 105 deletions
--- a/server/modules/routing/schemarouter/schemaroutersession.cc
+++ b/server/modules/routing/schemarouter/schemaroutersession.cc
@ -641,7 +641,8 @@ void SchemaRouterSession::handleError(GWBUF* pMessage,
        break;

    case ERRACT_REPLY_CLIENT:
-        if (m_client->session->state == SESSION_STATE_ROUTER_READY)
+        // The session pointer can be NULL if the creation fails when filters are being set up
+        if (m_client->session && m_client->session->state == SESSION_STATE_ROUTER_READY)
        {
            m_client->func.write(m_client, gwbuf_clone(pMessage));
        }