This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit cbf4fb90da4a4dfd51e384c51c98480f6ccb4cd7
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Apr 29 12:04:15 2024 +0100
Update internal fork of Commons BCEL to 6.9.0
---
MERGE.txt | 2 +-
java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java | 4 ++--
java/org/apache/tomcat/util/bcel/classfile/ElementValue.java | 1 +
webapps/docs/changelog.xml | 3 +++
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index c3e81ab842..e823ce862b 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -37,7 +37,7 @@ Unused code is removed
Sub-tree:
src/main/java/org/apache/bcel
The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-rel/commons-bcel-6.8.2 (2024-02-25)
+rel/commons-bcel-6.9.0 (2024-04-27)
Codec
-----
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
b/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
index 48a3644729..69a85b2c72 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
@@ -21,12 +21,12 @@ public class ArrayElementValue extends ElementValue
// For array types, this is the array
private final ElementValue[] elementValues;
- ArrayElementValue(final int type, final ElementValue[] datums, final
ConstantPool cpool) {
+ ArrayElementValue(final int type, final ElementValue[] elementValues,
final ConstantPool cpool) {
super(type, cpool);
if (type != ARRAY) {
throw new ClassFormatException("Only element values of type array
can be built with this ctor - type specified: " + type);
}
- this.elementValues = datums;
+ this.elementValues = elementValues != null ? elementValues :
ElementValue.EMPTY_ARRAY;
}
public ElementValue[] getElementValuesArray() {
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
b/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
index 8c68b3f696..3894f60a1a 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
@@ -60,6 +60,7 @@ public abstract class ElementValue {
public static final byte PRIMITIVE_LONG = 'J';
public static final byte PRIMITIVE_SHORT = 'S';
public static final byte PRIMITIVE_BOOLEAN = 'Z';
+ static final ElementValue[] EMPTY_ARRAY = {};
/**
* Reads an {@code element_value} as an {@code ElementValue}.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 47c4b174b5..f86a63668c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -208,6 +208,9 @@
<update>
Update SpotBugs to 4.8.4. (markt)
</update>
+ <update>
+ Update the internal fork of Apache Commons BCEL to 6.9.0. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
