[Libreoffice-commits] online.git: loolwsd/LOOLSession.hpp

Ashod Nakashian ashod.nakashian at collabora.co.uk
Sat May 21 03:20:06 UTC 2016


 loolwsd/LOOLSession.hpp |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 7444ad4348ec00dca2f28821e8f43eb2d56b5c2a
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Thu May 19 20:29:18 2016 -0400

    loolwsd: check for null WS before shutdown
    
    Change-Id: I47ad44cdfdbcac61bf64bf9e698f23c502a748a5
    Reviewed-on: https://gerrit.libreoffice.org/25235
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/LOOLSession.hpp b/loolwsd/LOOLSession.hpp
index 2e561f9..c262e0d 100644
--- a/loolwsd/LOOLSession.hpp
+++ b/loolwsd/LOOLSession.hpp
@@ -52,7 +52,10 @@ public:
 
     void shutdown(Poco::UInt16 statusCode, const std::string& message)
     {
-        _ws->shutdown(statusCode, message);
+        if (_ws)
+        {
+            _ws->shutdown(statusCode, message);
+        }
     }
 
     bool isActive() const { return _isActive; }


More information about the Libreoffice-commits mailing list