diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-05-14 21:42:10 -0400 |
|---|---|---|
| committer | Ashod Nakashian <ashnakash@gmail.com> | 2017-05-15 05:10:31 +0200 |
| commit | 7cff4fb08a2dba769a992300d24c0d5c3192b0a9 (patch) | |
| tree | 8b0136c9af0958432f3c5cdeb1bc57f0db70bddf /net/Socket.cpp | |
| parent | wsd: include version in http agent strings (diff) | |
| download | online-7cff4fb08a2dba769a992300d24c0d5c3192b0a9.tar.gz online-7cff4fb08a2dba769a992300d24c0d5c3192b0a9.zip | |
wsd: fix server shutdown
Thread-affinity checks must be inhibited
not just on Socket, but on the SocketPoll as well,
before destroying DocumentBroker instances.
Also, properly initialize the inhibit statics.
Change-Id: I2ced1554d477f0c3faf09bda74034cbae99e4ce1
Reviewed-on: https://gerrit.libreoffice.org/37608
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
Diffstat (limited to 'net/Socket.cpp')
| -rw-r--r-- | net/Socket.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/Socket.cpp b/net/Socket.cpp index 97018c8671..06afce839c 100644 --- a/net/Socket.cpp +++ b/net/Socket.cpp @@ -25,6 +25,7 @@ #include "WebSocketHandler.hpp" int SocketPoll::DefaultPollTimeoutMs = 5000; +std::atomic<bool> SocketPoll::InhibitThreadChecks(false); std::atomic<bool> Socket::InhibitThreadChecks(false); // help with initialization order |