GC _waitFinished

2 files changed, 2 insertions, 7 deletions

diff --git a/fnet/src/vespa/fnet/transport_thread.cpp b/fnet/src/vespa/fnet/transport_thread.cpp
index e351202ef0a..8c3783c74a4 100644
--- a/fnet/src/vespa/fnet/transport_thread.cpp
+++ b/fnet/src/vespa/fnet/transport_thread.cpp
@@ -223,8 +223,7 @@ FNET_TransportThread::FNET_TransportThread(FNET_Transport &owner_in)
       _pseudo_thread(),
       _started(false),
       _shutdown(false),
-      _finished(false),
-      _waitFinished(false)
+      _finished(false)
 {
     trapsigpipe();
 }
@@ -377,7 +376,6 @@ FNET_TransportThread::WaitFinished()
         return;
 
     std::unique_lock<std::mutex> guard(_shutdownLock);
-    _waitFinished = true;
     while (!_finished)
         _shutdownCond.wait(guard);
 }
@@ -551,9 +549,7 @@ FNET_TransportThread::endEventLoop() {
     {
         std::lock_guard<std::mutex> guard(_shutdownLock);
         _finished = true;
-        if (_waitFinished) {
-            _shutdownCond.notify_all();
-        }
+        _shutdownCond.notify_all();
     }
 
     LOG(spam, "Transport: event loop finished.");
diff --git a/fnet/src/vespa/fnet/transport_thread.h b/fnet/src/vespa/fnet/transport_thread.h
index be2a36419c8..36490c88656 100644
--- a/fnet/src/vespa/fnet/transport_thread.h
+++ b/fnet/src/vespa/fnet/transport_thread.h
@@ -50,7 +50,6 @@ private:
     std::atomic<bool>        _started;        // event loop started ?
     std::atomic<bool>        _shutdown;       // should stop event loop ?
     bool                     _finished;       // event loop stopped ?
-    bool                     _waitFinished;   // someone is waiting for _finished
 
     /**
      * Add an IOComponent to the list of components. This operation is