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

1 files changed, 3 insertions, 3 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();
     }
 
 }