Various cleanup and code deduplication.

2 files changed, 9 insertions, 9 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java b/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java
index b4f04da5986..39be91cf3e8 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java
@@ -210,17 +210,17 @@ public class InterleavedSearchInvoker extends SearchInvoker implements ResponseM
                 indexPartial++;
             }
         }
-        while ((indexCurrent < current.size()) && (merged.size() < needed)) {
-            LeanHit currentHit = current.get(indexCurrent++);
-            merged.add(currentHit);
-        }
-        while ((indexPartial < partial.size()) && (merged.size() < needed)) {
-            LeanHit incomingHit = partial.get(indexPartial++);
-            merged.add(incomingHit);
-        }
+        appendRemainingIfNeeded(merged, needed, current, indexCurrent);
+        appendRemainingIfNeeded(merged, needed, partial, indexPartial);
         return merged;
     }
 
+    private void appendRemainingIfNeeded(List<LeanHit> merged, int needed, List<LeanHit> hits, int index) {
+        while ((index < hits.size()) && (merged.size() < needed)) {
+            merged.add(hits.get(index++));
+        }
+    }
+
     private void ejectInvoker(SearchInvoker invoker) {
         invokers.remove(invoker);
         invoker.release();
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/LeanHit.java b/container-search/src/main/java/com/yahoo/search/dispatch/LeanHit.java
index bd0415fa449..f80cebe90c4 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/LeanHit.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/LeanHit.java
@@ -51,7 +51,7 @@ public class LeanHit implements Comparable<LeanHit> {
         return (res != 0) ? res : compareData(gid, o.gid);
     }
 
-    private static int compareData(byte[] left, byte[] right) {
+    public static int compareData(byte[] left, byte[] right) {
         int i = Arrays.mismatch(left, right);
         if (i < 0) {
             return 0;