aboutsummaryrefslogtreecommitdiffstats
path: root/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileProperties.java
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-04-26 14:37:10 +0200
committerJon Bratseth <bratseth@oath.com>2018-04-26 14:37:10 +0200
commitd11721c9bb7b532a2c3471232e68a95ce442d895 (patch)
tree0e3ca22eb591a819ed1c83c1766632ac27ecc21f /container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileProperties.java
parentfa3121763f67a3f4989ef9e4db88c27a802e3783 (diff)
Include Query model in listProperties
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileProperties.java')
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileProperties.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileProperties.java b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileProperties.java
index 324c1bf796e..3e1f664cf87 100644
--- a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileProperties.java
+++ b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileProperties.java
@@ -100,7 +100,8 @@ public class QueryProfileProperties extends Properties {
if (i == name.size()-1 && fieldDescription != null) { // at the end of the path, check the assignment type
value = fieldDescription.getType().convertFrom(value, profile.getRegistry());
if (value == null)
- throw new IllegalArgumentException("'" + value + "' is not a " + fieldDescription.getType().toInstanceDescription());
+ throw new IllegalArgumentException("'" + value + "' is not a " +
+ fieldDescription.getType().toInstanceDescription());
}
}
}
@@ -138,7 +139,6 @@ public class QueryProfileProperties extends Properties {
if (context == null) context = Collections.emptyMap();
Map<String, Object> properties = profile.listValues(path, context, substitution);
-
properties.putAll(super.listProperties(path, context, substitution));
if (references != null) {