Merge branch '2.1' into develop

2017-08-15 10:31:30 +03:00
parent 49ba1f8fa0 3485a32731
commit de7004cb95
12 changed files with 24 additions and 24 deletions
--- a/include/maxscale/filter.hh
+++ b/include/maxscale/filter.hh
@ -220,7 +220,7 @@ public:
    static MXS_FILTER_SESSION* newSession(MXS_FILTER* pInstance, MXS_SESSION* pSession)
    {
        FilterType* pFilter = static_cast<FilterType*>(pInstance);
-        FilterSessionType* pFilterSession;
+        FilterSessionType* pFilterSession = NULL;

        MXS_EXCEPTION_GUARD(pFilterSession = pFilter->newSession(pSession));