diff options
| author | Haavard <havardpe@yahoo-inc.com> | 2016-06-23 14:20:50 +0000 |
|---|---|---|
| committer | Haavard <havardpe@yahoo-inc.com> | 2016-06-24 10:59:01 +0000 |
| commit | 02f1ebc3adf09a7e9188ae5b4b46e6457cc409d0 (patch) | |
| tree | 490b058b6109efad19d0e765b78ff9da80b4bb6b /fastlib | |
| parent | 9d15989bfe2a27b3555f2df1e9f92504f220ff2f (diff) | |
fix race condition in legacy http server
this is a minimal fix to avoid shutdown hang when http server
start/stop gets reordered.
Diffstat (limited to 'fastlib')
| -rw-r--r-- | fastlib/src/vespa/fastlib/net/httpserver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fastlib/src/vespa/fastlib/net/httpserver.cpp b/fastlib/src/vespa/fastlib/net/httpserver.cpp index 6d60b609b5f..e12477bd030 100644 --- a/fastlib/src/vespa/fastlib/net/httpserver.cpp +++ b/fastlib/src/vespa/fastlib/net/httpserver.cpp @@ -406,7 +406,7 @@ void Fast_HTTPServer::Stop(void) { _runningMutex.Lock(); _stopSignalled = true; - if (_isRunning) { + if (_acceptThread) { _acceptThread->SetBreakFlag(); } _runningMutex.Unlock(); |