This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5b71a7174ae4158fc427388cc91707613a6df58c Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Jan 3 12:41:45 2023 +0000 Update package renamed fork of Commons Codec --- MERGE.txt | 2 +- java/org/apache/tomcat/util/codec/binary/BaseNCodec.java | 5 +++-- webapps/docs/changelog.xml | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/MERGE.txt b/MERGE.txt index 103e396411..a311fc8c56 100644 --- a/MERGE.txt +++ b/MERGE.txt @@ -43,7 +43,7 @@ Codec Sub-tree: src/main/java/org/apache/commons/codec The SHA1 ID / tag for the most recent commit to be merged to Tomcat is: -ae32a3f2fa6b722b8ad67bd125a52edb78932314 (2022-11-29) +f03cbd3ba741758ead9f59bc07e6688a739a4813 (2023-01-03) Note: Only classes required for Base64 encoding/decoding. The rest are removed. FileUpload diff --git a/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java b/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java index 3e912a985c..a234da2f0c 100644 --- a/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java +++ b/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java @@ -16,6 +16,8 @@ */ package org.apache.tomcat.util.codec.binary; +import java.util.Arrays; + import org.apache.tomcat.util.buf.HexUtils; import org.apache.tomcat.util.res.StringManager; @@ -248,8 +250,7 @@ public abstract class BaseNCodec { newCapacity = createPositiveCapacity(minCapacity); } - final byte[] b = new byte[newCapacity]; - System.arraycopy(context.buffer, 0, b, 0, context.buffer.length); + final byte[] b = Arrays.copyOf(context.buffer, newCapacity); context.buffer = b; return b; } diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 0f3ff2285b..bdf6967e64 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -144,6 +144,10 @@ Update the internal fork of Apache Commons BCEL to 2ee2bff (2023-01-03, 6.7.1-SNAPSHOT). (markt) </update> + <update> + Update the internal fork of Apache Commons Codec to 3eafd6c (2023-01-03, + 1.16-SNAPSHOT). (markt) + </update> <update> Update the internal fork of Apache Commons FileUpload to 34eb241 (2023-01-03, 2.0-SNAPSHOT). (markt) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org