aboutsummaryrefslogtreecommitdiffstats
path: root/container-search/src/main/java/com/yahoo/search/query/ranking
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-03-21 08:45:23 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2019-03-21 08:45:23 +0100
commit47e12867aee53070b589b8000941f30d429c3998 (patch)
tree66501678e61aa000dd7bb0a0a0ff3b029d5e00a4 /container-search/src/main/java/com/yahoo/search/query/ranking
parentf60935d45bd01a0e0edfa5dc605936ad96f88aaa (diff)
Enusure that explicit overrides go through
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/query/ranking')
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/ranking/SoftTimeout.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/query/ranking/SoftTimeout.java b/container-search/src/main/java/com/yahoo/search/query/ranking/SoftTimeout.java
index 05cbed6b6d9..1bca3df4d77 100644
--- a/container-search/src/main/java/com/yahoo/search/query/ranking/SoftTimeout.java
+++ b/container-search/src/main/java/com/yahoo/search/query/ranking/SoftTimeout.java
@@ -37,7 +37,7 @@ public class SoftTimeout implements Cloneable {
}
public static QueryProfileType getArgumentType() { return argumentType; }
- private boolean enabled = true;
+ private Boolean enabled = null;
private Double factor = null;
private Double tailcost = null;
@@ -69,8 +69,8 @@ public class SoftTimeout implements Cloneable {
/** Internal operation - DO NOT USE */
public void prepare(RankProperties rankProperties) {
- if ( !enabled)
- rankProperties.put("vespa.softtimeout.enable", "false");
+ if (enabled != null)
+ rankProperties.put("vespa.softtimeout.enable", String.valueOf(enabled));
if (factor != null)
rankProperties.put("vespa.softtimeout.factor", String.valueOf(factor));
if (tailcost != null)
@@ -90,7 +90,7 @@ public class SoftTimeout implements Cloneable {
@Override
public int hashCode() {
int hash = 0;
- if (enabled) hash += 11;
+ if (enabled != null) hash += 11;
if (factor != null) hash += 13 * factor.hashCode();
if (tailcost != null) hash += 17 * tailcost.hashCode();
return hash;