This is an automated email from the ASF dual-hosted git repository. heliang666s pushed a commit to branch fix-resource-leaks in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 8f112306cf6e6e8bd3ebc00d9a4b3ffd0910f688 Author: heliang666s <[email protected]> AuthorDate: Tue Dec 16 11:07:04 2025 +0800 fix: wrap ByteArrayOutputStream in try-with-resources Update Bzip2.compress() and Bytes.zip() to follow PMC requirements --- dubbo-common/src/main/java/org/apache/dubbo/common/io/Bytes.java | 6 +++--- .../java/org/apache/dubbo/rpc/protocol/tri/compressor/Bzip2.java | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/io/Bytes.java b/dubbo-common/src/main/java/org/apache/dubbo/common/io/Bytes.java index 0617e6704a..431350c3e9 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/io/Bytes.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/io/Bytes.java @@ -784,11 +784,11 @@ public class Bytes { * @throws IOException */ public static byte[] zip(byte[] bytes) throws IOException { - UnsafeByteArrayOutputStream bos = new UnsafeByteArrayOutputStream(); - try (DeflaterOutputStream os = new DeflaterOutputStream(bos)) { + try (UnsafeByteArrayOutputStream bos = new UnsafeByteArrayOutputStream(); + DeflaterOutputStream os = new DeflaterOutputStream(bos)) { os.write(bytes); + return bos.toByteArray(); } - return bos.toByteArray(); } /** diff --git a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/compressor/Bzip2.java b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/compressor/Bzip2.java index e77fccc120..2e9f8e0352 100644 --- a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/compressor/Bzip2.java +++ b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/compressor/Bzip2.java @@ -57,14 +57,13 @@ public class Bzip2 implements Compressor, DeCompressor { return new byte[0]; } - ByteArrayOutputStream out = new ByteArrayOutputStream(); - try (BZip2CompressorOutputStream cos = new BZip2CompressorOutputStream(out)) { + try (ByteArrayOutputStream out = new ByteArrayOutputStream(); + BZip2CompressorOutputStream cos = new BZip2CompressorOutputStream(out)) { cos.write(payloadByteArr); + return out.toByteArray(); } catch (Exception e) { throw new IllegalStateException(e); } - - return out.toByteArray(); } @Override
