Merge branch 'master' into lesters/add-local-llms

2 files changed, 5 insertions, 6 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/InvokerResult.java b/container-search/src/main/java/com/yahoo/search/dispatch/InvokerResult.java
index 88d6b68a610..9c41c0b930f 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/InvokerResult.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/InvokerResult.java
@@ -7,7 +7,6 @@ import com.yahoo.search.Result;
 import com.yahoo.search.query.Sorting;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -22,7 +21,7 @@ public class InvokerResult {
 
     public InvokerResult(Result result) {
         this.result = result;
-        this.leanHits = Collections.emptyList();
+        this.leanHits = List.of();
     }
 
     public InvokerResult(Query query, int expectedHits) {
@@ -54,7 +53,8 @@ public class InvokerResult {
             fh.setCached(false);
             result.hits().add(fh);
         }
-        leanHits.clear();
+        if (!leanHits.isEmpty())
+            leanHits.clear();
     }
 
 }
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/SearchPath.java b/container-search/src/main/java/com/yahoo/search/dispatch/SearchPath.java
index 9302ce5b7c6..add562bd5ad 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/SearchPath.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/SearchPath.java
@@ -8,7 +8,6 @@ import com.yahoo.search.dispatch.searchcluster.Node;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
@@ -163,7 +162,7 @@ public class SearchPath {
                 nodes = parseNodeRange(nodes, ret);
             } else {
                 if (isWildcard(nodes)) { // any node will be accepted
-                    return Collections.emptyList();
+                    return List.of();
                 }
                 nodes = parseNodeNum(nodes, ret);
             }
@@ -231,7 +230,7 @@ public class SearchPath {
 
         public Collection<Integer> matches(int max) {
             if (from >= max) {
-                return Collections.emptyList();
+                return List.of();
             }
             int end = Math.min(to, max);
             return IntStream.range(from, end).boxed().toList();