A group hit is not meta since it contains result data

3 files changed, 7 insertions, 9 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/handler/HttpSearchResponse.java b/container-search/src/main/java/com/yahoo/search/handler/HttpSearchResponse.java
index ace262f053c..5c897245e64 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/HttpSearchResponse.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/HttpSearchResponse.java
@@ -58,13 +58,10 @@ public class HttpSearchResponse extends ExtendedResponse {
     }
 
     /**
-     * Copy custom HTTP headers from the search result over to the HTTP
-     * response.
+     * Copy custom HTTP headers from the search result over to the HTTP response.
      *
-     * @param outputHeaders
-     *            the headers which will be sent to a client
-     * @param searchHeaders
-     *            the headers from the search result, or null
+     * @param outputHeaders the headers which will be sent to a client
+     * @param searchHeaders the headers from the search result, or null
      */
     private static void populateHeaders(HeaderFields outputHeaders,
             ListMap<String, String> searchHeaders) {
diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
index 057b607460c..a38dd5dc67a 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
@@ -293,7 +293,7 @@ public class SearchHandler extends LoggingRequestHandler {
     @Override
     public Optional<Request.RequestType> getRequestType() { return Optional.of(Request.RequestType.READ); }
 
-    private int getHttpResponseStatus(com.yahoo.container.jdisc.HttpRequest httpRequest, Result result) {
+    static int getHttpResponseStatus(com.yahoo.container.jdisc.HttpRequest httpRequest, Result result) {
         boolean benchmarkOutput = VespaHeaders.benchmarkOutput(httpRequest);
         if (benchmarkOutput) {
             return VespaHeaders.getEagerErrorStatus(result.hits().getError(),
diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java b/container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java
index b752467f418..a9601ee5ec2 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java
@@ -43,8 +43,9 @@ public class SearchResponse {
 
     static boolean isSuccess(Result r) {
         if (r.hits().getErrorHit() == null) return true;
-        for (Hit hit : r.hits())
-            if ( ! hit.isMeta()) return true; // contains data : success
+        for (Hit hit : r.hits()) {
+            if (!hit.isMeta()) return true; // contains data : success
+        }
         return false;
     }