diff options
author | Henrik <henrik.hoiness@online.no> | 2018-08-09 09:51:38 +0200 |
---|---|---|
committer | Henrik <henrik.hoiness@online.no> | 2018-08-09 09:51:38 +0200 |
commit | 1a63cc82707744926c14d9ae7a934d411bcc8e3f (patch) | |
tree | a5ddd8cbc488f4115133d2abaf82201c043eb2c3 /container-search/src | |
parent | f00d6d02650f4a42574e1133b26bb620342330ba (diff) |
URL-parameters now overrides JSON-parameters
Diffstat (limited to 'container-search/src')
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java | 3 |
1 files changed, 2 insertions, 1 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 efd3a44f095..c6d877c006a 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 @@ -580,9 +580,10 @@ public class SearchHandler extends LoggingRequestHandler { // Create request-mapping Map<String, String> requestMap = new HashMap<>(); - request.propertyMap().forEach(requestMap::put); createRequestMapping(inspector, requestMap, ""); + requestMap.putAll(request.propertyMap()); + // Throws QueryException if query contains both yql- and select-parameter if (requestMap.containsKey("yql") && (requestMap.containsKey("select.where") || requestMap.containsKey("select.grouping")) ) { throw new QueryException("Illegal query: Query contains both yql- and select-parameter"); |