summaryrefslogtreecommitdiffstats
path: root/vespa-http-client
diff options
context:
space:
mode:
authorHaakon Dybdahl <dybdahl@yahoo-inc.com>2016-12-12 07:48:33 +0100
committerHaakon Dybdahl <dybdahl@yahoo-inc.com>2016-12-12 07:48:33 +0100
commitabc6340717b38e04e440b7526eaab40c2f3f96e2 (patch)
treec31e9674687f32c53649b217ee9781f699ab062c /vespa-http-client
parentde5aae2629450ebfd5ae2c50b404749b0d5286b1 (diff)
Improve close method so it waits for operations even when zero retries.
Diffstat (limited to 'vespa-http-client')
-rw-r--r--vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/FeedClientImpl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/FeedClientImpl.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/FeedClientImpl.java
index d7f001eff31..97362499162 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/FeedClientImpl.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/FeedClientImpl.java
@@ -27,7 +27,7 @@ public class FeedClientImpl implements FeedClient {
public FeedClientImpl(
SessionParams sessionParams, ResultCallback resultCallback, ScheduledThreadPoolExecutor timeoutExecutor) {
- this.closeTimeoutMs = sessionParams.getConnectionParams().getMaxRetries() * (
+ this.closeTimeoutMs = (1 + sessionParams.getConnectionParams().getMaxRetries()) * (
sessionParams.getFeedParams().getServerTimeout(TimeUnit.MILLISECONDS) +
sessionParams.getFeedParams().getClientTimeout(TimeUnit.MILLISECONDS));
this.operationProcessor = new OperationProcessor(