Assume all will go well, and undo if bad.

1 files changed, 4 insertions, 2 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/server/proton_config_fetcher.cpp b/searchcore/src/vespa/searchcore/proton/server/proton_config_fetcher.cpp
index 4e12ea97a0d..ed0e9ad79c5 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton_config_fetcher.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton_config_fetcher.cpp
@@ -169,12 +169,14 @@ void
 ProtonConfigFetcher::start(FastOS_ThreadPool & threadPool)
 {
     fetchConfigs();
+    lock_guard guard(_mutex);
+    if (_running) return;
+    _running = true;
     if (threadPool.NewThread(this, nullptr) == nullptr) {
+        _running = false;
         throw vespalib::IllegalStateException(
                 "Failed starting thread for proton config fetcher");
     }
-    lock_guard guard(_mutex);
-    _running = true;
 }
 
 void