summaryrefslogtreecommitdiffstats
path: root/container-search/src/main/java/com/yahoo/search/searchchain/model
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2019-05-07 12:37:41 +0200
committerJon Bratseth <bratseth@verizonmedia.com>2019-05-07 12:37:41 +0200
commit35760016e0f038e5696730d227aea8f6ea3e7139 (patch)
tree2673d3e88468616a8685fef488a0b4ba74aaadfa /container-search/src/main/java/com/yahoo/search/searchchain/model
parenta2b9e7ec76a39f31890fd854bbd43887e9507675 (diff)
Preserve federation structure in Result on timeout
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/searchchain/model')
-rw-r--r--container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationOptions.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationOptions.java b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationOptions.java
index 0843ec074b6..6eeb425fc9d 100644
--- a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationOptions.java
+++ b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationOptions.java
@@ -30,7 +30,7 @@ public class FederationOptions implements Cloneable {
* Creates a fully specified set of options
*
* @param optional whether this should be optional
- * @param timeoutInMilliseconds the max time to wait for a result from this source, or null to not specify a limit
+ * @param timeoutInMilliseconds the max time to wait for a result from this source, or null to use the timeout of the query
* @param requestTimeoutInMilliseconds the max time to allow this request to live, or null to make this the same as
* timeoutInMilliseconds. Setting this higher than timeoutInMilliseconds is
* useful to use queries to populate the cache of slow sources