From 2176273a561fee6daca442fc6ecc5abb461db332 Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Wed, 5 Jul 2023 17:14:24 -0400 Subject: [PATCH] GH-36332: [Java] Fix Spark integration failure due to Netty version upgrade --- .../main/java/io/netty/buffer/PooledByteBufAllocatorL.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/java/memory/memory-netty/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java b/java/memory/memory-netty/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java index 870114d7db1..a6b7d0eec16 100644 --- a/java/memory/memory-netty/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java +++ b/java/memory/memory-netty/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java @@ -161,8 +161,7 @@ public InnerAllocator() { } private UnsafeDirectLittleEndian newDirectBufferL(int initialCapacity, int maxCapacity) { - PoolArenasCache cache = threadCache(); - PoolArena directArena = cache.directArena; + PoolArena directArena = threadCache().directArena; if (directArena != null) { @@ -178,7 +177,7 @@ private UnsafeDirectLittleEndian newDirectBufferL(int initialCapacity, int maxCa hugeBufferSize); } else { // within chunk, use arena. - ByteBuf buf = directArena.allocate(cache, initialCapacity, maxCapacity); + ByteBuf buf = directArena.allocate(threadCache(), initialCapacity, maxCapacity); if (!(buf instanceof PooledUnsafeDirectByteBuf)) { fail(); }