If posting to self, the Q will be unbounded

2 files changed, 11 insertions, 1 deletions

diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/IOThread.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/IOThread.java
index dc753deb9f9..328260e6761 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/IOThread.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/IOThread.java
@@ -165,7 +165,7 @@ class IOThread implements Runnable, AutoCloseable {
 
 
     public void post(final Document document) throws InterruptedException {
-        documentQueue.put(document, false);
+        documentQueue.put(document, Thread.currentThread() == thread);
     }
 
     @Override
diff --git a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/communication/CloseableQTestCase.java b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/communication/CloseableQTestCase.java
index 4148e652d55..82538179ef9 100644
--- a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/communication/CloseableQTestCase.java
+++ b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/communication/CloseableQTestCase.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.http.client.core.communication;
 import com.yahoo.vespa.http.client.core.Document;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 public class CloseableQTestCase {
@@ -35,4 +36,13 @@ public class CloseableQTestCase {
         } catch (InterruptedException e) {
         }
     }
+
+    @Test
+    public void requireThatSelfIsUnbounded() throws InterruptedException {
+        DocumentQueue q = new DocumentQueue(1);
+        q.put(new Document("1", "data", null /* context */), true);
+        q.put(new Document("2", "data", null /* context */), true);
+        q.put(new Document("3", "data", null /* context */), true);
+        assertEquals(3, q.size());
+    }
 }