Revert back to using poll for nextUpdate

1 files changed, 3 insertions, 3 deletions

diff --git a/config/src/vespa/config/subscription/configsubscription.cpp b/config/src/vespa/config/subscription/configsubscription.cpp
index 5eea0895eed..04904d07b17 100644
--- a/config/src/vespa/config/subscription/configsubscription.cpp
+++ b/config/src/vespa/config/subscription/configsubscription.cpp
@@ -31,11 +31,11 @@ ConfigSubscription::~ConfigSubscription()
 bool
 ConfigSubscription::nextUpdate(int64_t generation, vespalib::steady_time deadline)
 {
-    if (_closed || !_holder->wait_until(deadline)) { return false; }
-    if (_closed) { return false; }  // The above wait_until can be interrupted
+    if (_closed || !_holder->poll()) {
+        return false;
+    }
     auto old = std::move(_next);
     _next = _holder->provide();
-    if ( ! _next) { return false; }
     if (old) {
         _next->merge(*old);
     }