Do not wait forever in close, in some cases the queue will get drained too slowly.

1 files changed, 3 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 62a93c84f79..64836ccb20d 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
@@ -11,6 +11,7 @@ import com.yahoo.vespa.http.client.core.operationProcessor.OperationProcessor;
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CodingErrorAction;
 import java.nio.charset.StandardCharsets;
+import java.time.Instant;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 
 /**
@@ -52,7 +53,8 @@ public class FeedClientImpl implements FeedClient {
 
     @Override
     public void close() {
-        while (operationProcessor.getIncompleteResultQueueSize() > 0) {
+        Instant startTime = Instant.now();
+        while (operationProcessor.getIncompleteResultQueueSize() > 0 && startTime.plusSeconds(30).isAfter(Instant.now())) {
             try {
                 Thread.sleep(500);
             } catch (InterruptedException e) {