[Libreoffice-commits] online.git: net/Socket.hpp wsd/LOOLWSD.cpp

[Ashod Nakashian]

 net/Socket.hpp  |    2 +-
 wsd/LOOLWSD.cpp |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f2f00402755e765019c9a38a84500f243156a1bd
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date:   Sun Mar 26 23:08:10 2017 -0400

    wsd: use isCorrectThread
    
    Change-Id: Id63c30b19489d590b995e0ea66ef2f44e8cddfb7
    Reviewed-on: https://gerrit.libreoffice.org/35738
    Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
    Tested-by: Ashod Nakashian <ashnak...@gmail.com>

diff --git a/net/Socket.hpp b/net/Socket.hpp
index 6a511744..9ff5a85a 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -288,7 +288,7 @@ public:
     }
 
     /// Are we running in either shutdown, or the polling thread.
-    bool isCorrectThread()
+    bool isCorrectThread() const
     {
         return _stop || std::this_thread::get_id() == _owner;
     }
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 05abba1d..ad1f4ece 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1416,6 +1416,7 @@ private:
         if (docBroker)
         {
             auto lock = docBroker->getLock();
+            assert(docBroker->isCorrectThread());
             docBroker->terminateChild(lock, "Service unavailable", false);
         }
     }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits