From 2dbd8991799373517bd2a5dbd9f6683c4868c995 Mon Sep 17 00:00:00 2001 From: Miguel Aranda Date: Wed, 7 Jan 2026 15:16:15 +0000 Subject: [PATCH 1/2] Add heapBuffer allocation to BufferAllocator --- .../src/main/java/org/conscrypt/BufferAllocator.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/common/src/main/java/org/conscrypt/BufferAllocator.java b/common/src/main/java/org/conscrypt/BufferAllocator.java index c3d6d8725..f9875b615 100644 --- a/common/src/main/java/org/conscrypt/BufferAllocator.java +++ b/common/src/main/java/org/conscrypt/BufferAllocator.java @@ -27,6 +27,11 @@ public abstract class BufferAllocator { @Override public AllocatedBuffer allocateDirectBuffer(int capacity) { return AllocatedBuffer.wrap(ByteBuffer.allocateDirect(capacity)); + } + + @Override + public AllocatedBuffer allocateHeapBuffer(int capacity) { + return AllocatedBuffer.wrap(ByteBuffer.allocate(capacity)); } }; @@ -41,4 +46,9 @@ public static BufferAllocator unpooled() { * Allocates a direct (i.e. non-heap) buffer with the given capacity. */ public abstract AllocatedBuffer allocateDirectBuffer(int capacity); + + /** + * Allocates a heap buffer with the given capacity. + */ + public abstract AllocatedBuffer allocateHeapBuffer(int capacity); } From 28bcd4f07619d5745828469dfff4df3917c9ba30 Mon Sep 17 00:00:00 2001 From: Miguel Aranda Date: Wed, 7 Jan 2026 15:20:27 +0000 Subject: [PATCH 2/2] Correct whitespace --- common/src/main/java/org/conscrypt/BufferAllocator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/org/conscrypt/BufferAllocator.java b/common/src/main/java/org/conscrypt/BufferAllocator.java index f9875b615..55fb685e6 100644 --- a/common/src/main/java/org/conscrypt/BufferAllocator.java +++ b/common/src/main/java/org/conscrypt/BufferAllocator.java @@ -27,7 +27,7 @@ public abstract class BufferAllocator { @Override public AllocatedBuffer allocateDirectBuffer(int capacity) { return AllocatedBuffer.wrap(ByteBuffer.allocateDirect(capacity)); - } + } @Override public AllocatedBuffer allocateHeapBuffer(int capacity) {