Changes from review.

1 files changed, 3 insertions, 4 deletions

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 c9e723db6d0..5ac1f834031 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
@@ -586,10 +586,9 @@ public class SearchHandler extends LoggingRequestHandler {
                 throw new QueryException("Illegal query: Query contains both yql- and select-parameter");
             }
 
-            // The query-parameter overrides the select-parameter. Removing them here to prevent further processing of select-parameters.
-            if (requestMap.containsKey("query")) {
-                requestMap.remove("select.where");
-                requestMap.remove("select.grouping");
+            // Throws QueryException if query contains both query- and select-parameter
+            if (requestMap.containsKey("query") && (requestMap.containsKey("select.where") || requestMap.containsKey("select.grouping")) ) {
+                throw new QueryException("Illegal query: Query contains both query- and select-parameter");
             }
 
             return requestMap;