summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@yahoo-inc.com>2016-06-18 18:11:15 +0000
committerTor Egge <Tor.Egge@yahoo-inc.com>2016-06-18 18:11:15 +0000
commitc986a7bf2f1dc6699c1718a281747d7da6c3a021 (patch)
tree2eb3f1a0eb8ab207b0d67b279cf6803a1a3c29c0 /searchcore
parent9fbc54f37209c21e60aba28fda7ad1c6cde46411 (diff)
Reduce scope of guard to avoid occasional deadlock when closing
flush engine.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp
index f3013b4e5de..9d5cf4c006f 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp
@@ -90,8 +90,8 @@ FlushEngine::start()
FlushEngine &
FlushEngine::close()
{
- MonitorGuard strategyGuard(_strategyMonitor);
{
+ MonitorGuard strategyGuard(_strategyMonitor);
MonitorGuard guard(_monitor);
_closed = true;
guard.broadcast();