Fix ByteBufferAccumulator minSize

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
jetty · Nov 16, 2020 · 5788fe6 · 5788fe6
1 parent a1aa5dc
commit 5788fe6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ByteBufferAccumulator.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ByteBufferAccumulator.java
@@ -63,6 +63,16 @@ public ByteBufferPool getByteBufferPool()
         return _bufferPool;
     }
 
+    /**
+     * Get the last buffer of the accumulator, this can be written to directly to avoid copying into the accumulator.
+     * @param minAllocationSize new buffers will be allocated to have at least this size.
+     * @return a buffer with at least {@code minSize} space to write into.
+     */
+    public ByteBuffer ensureBuffer(int minAllocationSize)
+    {
+        return ensureBuffer(1, minAllocationSize);
+    }
+
     /**
      * Get the last buffer of the accumulator, this can be written to directly to avoid copying into the accumulator.
      * @param minSize the smallest amount of remaining space before a new buffer is allocated.
@@ -72,7 +82,7 @@ public ByteBufferPool getByteBufferPool()
     public ByteBuffer ensureBuffer(int minSize, int minAllocationSize)
     {
         ByteBuffer buffer = _buffers.isEmpty() ? BufferUtil.EMPTY_BUFFER : _buffers.get(_buffers.size() - 1);
-        if (BufferUtil.space(buffer) <= minSize)
+        if (BufferUtil.space(buffer) < minSize)
         {
             buffer = _bufferPool.acquire(minAllocationSize, false);
             _buffers.add(buffer);
@@ -90,7 +100,7 @@ public void copyBuffer(ByteBuffer buffer)
     {
         while (buffer.hasRemaining())
         {
-            ByteBuffer b = ensureBuffer(0, buffer.remaining());
+            ByteBuffer b = ensureBuffer(buffer.remaining());
             int pos = BufferUtil.flipToFill(b);
             BufferUtil.put(buffer, b);
             BufferUtil.flipToFlush(b, pos);

diff --git a/...c/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java b/...c/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
@@ -496,7 +496,7 @@ private void compress(FrameEntry entry, boolean first)
                 {
                     while (true)
                     {
-                        ByteBuffer buffer = accumulator.ensureBuffer(0, outputLength);
+                        ByteBuffer buffer = accumulator.ensureBuffer(8, outputLength);
                         int compressed = deflater.deflate(buffer.array(), buffer.arrayOffset() + buffer.position(), buffer.capacity() - buffer.limit(), Deflater.SYNC_FLUSH);
                         buffer.limit(buffer.limit() + compressed);