Avoid that we miss a stop that happens while we are STARTING.

1 files changed, 2 insertions, 0 deletions

diff --git a/staging_vespalib/src/vespa/vespalib/util/document_runnable.cpp b/staging_vespalib/src/vespa/vespalib/util/document_runnable.cpp
index a612d5652ff..11fbf9d1655 100644
--- a/staging_vespalib/src/vespa/vespalib/util/document_runnable.cpp
+++ b/staging_vespalib/src/vespa/vespalib/util/document_runnable.cpp
@@ -29,6 +29,7 @@ bool Runnable::stop()
 {
     vespalib::MonitorGuard monitor(_stateLock);
     if (_state == STOPPING || _state == NOT_RUNNING) return false;
+    while (_state == STARTING) monitor.wait();
     GetThread()->SetBreakFlag();
     _state = STOPPING;
     return onStop();
@@ -55,6 +56,7 @@ void Runnable::Run(FastOS_ThreadInterface*, void*)
         // called even though about to stop for consistency)
         if (_state == STARTING) {
             _state = RUNNING;
+            monitor.broadcast();
         }
     }