Merge pull request #6255 from vespa-engine/balder/invert-and-simplify

Invert the logic and simplify the loop.

1 files changed, 5 insertions, 8 deletions

diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/datasetcollection.cpp b/searchcore/src/vespa/searchcore/fdispatch/search/datasetcollection.cpp
index ea981d1cc01..d99b32ac138 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/datasetcollection.cpp
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/datasetcollection.cpp
@@ -198,16 +198,13 @@ FastS_DataSetCollection::GetDataSet()
 bool
 FastS_DataSetCollection::AreEnginesReady()
 {
-    bool ready = true;
-
-    for (uint32_t datasetidx = 0;
-         ready && (datasetidx < GetMaxNumDataSets());
-         datasetidx++)
-    {
+    for (uint32_t datasetidx = 0; datasetidx < GetMaxNumDataSets(); datasetidx++) {
         FastS_DataSetBase *dataset = PeekDataSet(datasetidx);
-        ready = (dataset != nullptr && !dataset->AreEnginesReady());
+        if ((dataset != nullptr) && !dataset->AreEnginesReady()) {
+            return false;
+        }
     }
-    return ready;
+    return true;
 }