We need to grow if we are too small..... If not we never finish.

2 files changed, 10 insertions, 1 deletions

diff --git a/container-search/src/main/java/com/yahoo/fs4/BasicPacket.java b/container-search/src/main/java/com/yahoo/fs4/BasicPacket.java
index 7b2d3742fbf..f87721dc503 100644
--- a/container-search/src/main/java/com/yahoo/fs4/BasicPacket.java
+++ b/container-search/src/main/java/com/yahoo/fs4/BasicPacket.java
@@ -232,7 +232,7 @@ public abstract class BasicPacket {
                 break;
             }
             catch (BufferTooSmallException e) {
-                buffer = ByteBuffer.allocate(buffer.capacity());
+                buffer = ByteBuffer.allocate(buffer.capacity()*2);
             }
         }
         return buffer;
diff --git a/container-search/src/test/java/com/yahoo/fs4/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/QueryTestCase.java
index 3444a1b2eba..911831e3a65 100644
--- a/container-search/src/test/java/com/yahoo/fs4/test/QueryTestCase.java
+++ b/container-search/src/test/java/com/yahoo/fs4/test/QueryTestCase.java
@@ -192,6 +192,15 @@ public class QueryTestCase {
     }
 
     @Test
+    public void testBufferExpands() throws BufferTooSmallException {
+        Query query = new Query("/?query=chain&sortspec=%2Ba+-b&timeout=0");
+        QueryPacket packet = QueryPacket.create("container.0", query);
+
+        ByteBuffer buffer = packet.grantEncodingBuffer(0, ByteBuffer.allocate(2));
+        assertEquals(64, buffer.capacity());
+    }
+
+    @Test
     public void testPhraseEqualsPhraseWithPhraseSegment() throws BufferTooSmallException {
         Query query = new Query();
         PhraseItem p = new PhraseItem();