From 7522d530ac0f9825e6998e997a1b0757302e25c7 Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Mon, 15 Jul 2013 10:08:44 +0200 Subject: [PATCH] Use the allocator of the src ByteBuf to allocate the new ByteBuf --- .../src/main/java/io/netty/handler/codec/base64/Base64.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/codec/src/main/java/io/netty/handler/codec/base64/Base64.java b/codec/src/main/java/io/netty/handler/codec/base64/Base64.java index 7cf4d567ff..a1a9aa6635 100644 --- a/codec/src/main/java/io/netty/handler/codec/base64/Base64.java +++ b/codec/src/main/java/io/netty/handler/codec/base64/Base64.java @@ -20,7 +20,6 @@ package io.netty.handler.codec.base64; import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; /** * Utility class for {@link ByteBuf} that encodes and decodes to and from @@ -113,7 +112,7 @@ public final class Base64 { } int len43 = len * 4 / 3; - ByteBuf dest = Unpooled.buffer( + ByteBuf dest = src.alloc().buffer( len43 + (len % 3 > 0 ? 4 : 0) + // Account for padding (breakLines ? len43 / MAX_LINE_LENGTH : 0)).order(src.order()); // New lines @@ -217,7 +216,7 @@ public final class Base64 { byte[] DECODABET = decodabet(dialect); int len34 = len * 3 / 4; - ByteBuf dest = Unpooled.buffer(len34).order(src.order()); // Upper limit on size of output + ByteBuf dest = src.alloc().buffer(len34).order(src.order()); // Upper limit on size of output int outBuffPosn = 0; byte[] b4 = new byte[4];