This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 92f4713e11 Update the internal fork of Apache Commons BCEL to 6.12.0
92f4713e11 is described below
commit 92f4713e11f4278304421b7d67ca06495332d5f4
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Feb 10 19:49:28 2026 +0000
Update the internal fork of Apache Commons BCEL to 6.12.0
---
MERGE.txt | 2 +-
java/org/apache/tomcat/util/bcel/Const.java | 138 +++++++++++++--------
.../bcel/classfile/AnnotationElementValue.java | 5 +
.../util/bcel/classfile/AnnotationEntry.java | 8 +-
.../tomcat/util/bcel/classfile/ClassParser.java | 24 ++--
.../tomcat/util/bcel/classfile/Constant.java | 8 +-
.../tomcat/util/bcel/classfile/ConstantClass.java | 4 +-
.../tomcat/util/bcel/classfile/ConstantDouble.java | 2 +-
.../tomcat/util/bcel/classfile/ConstantFloat.java | 2 +-
.../util/bcel/classfile/ConstantInteger.java | 2 +-
.../tomcat/util/bcel/classfile/ConstantLong.java | 2 +-
.../tomcat/util/bcel/classfile/ConstantPool.java | 2 +-
.../tomcat/util/bcel/classfile/JavaClass.java | 2 +-
.../util/bcel/classfile/SimpleElementValue.java | 2 +-
java/org/apache/tomcat/util/bcel/package-info.java | 4 +-
webapps/docs/changelog.xml | 3 +
16 files changed, 128 insertions(+), 82 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index d7e8444dfb..ae5fde42fe 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.10.0 (2024-07-23)
+rel/commons-bcel-6.12.0 (2026-01-22)
FileUpload
----------
diff --git a/java/org/apache/tomcat/util/bcel/Const.java
b/java/org/apache/tomcat/util/bcel/Const.java
index cd737de9b6..7d72a348c2 100644
--- a/java/org/apache/tomcat/util/bcel/Const.java
+++ b/java/org/apache/tomcat/util/bcel/Const.java
@@ -24,199 +24,202 @@ public final class Const {
/**
* Java class file format Magic number: {@value}.
*
- * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.1-200-A";>
The ClassFile Structure
- * in The Java Virtual Machine Specification</a>
+ * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.1-200-A";>
The ClassFile
+ * Structure in The Java Virtual Machine Specification</a>
*/
public static final int JVM_CLASSFILE_MAGIC = 0xCAFEBABE;
/**
* One of the access flags for fields, methods, or classes: {@value}.
*
- * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.1-200-E.1";>
Flag definitions for
- * Classes in the Java Virtual Machine Specification (Java SE 9
Edition).</a>
- * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.5";>
Flag definitions for Fields
- * in the Java Virtual Machine Specification (Java SE 9 Edition).</a>
- * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.6";>
Flag definitions for Methods
- * in the Java Virtual Machine Specification (Java SE 9 Edition).</a>
+ * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.1-200-E.1";>
Flag definitions
+ * for Classes in the Java Virtual Machine Specification (Java SE
9 Edition).</a>
+ * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.5";>
Flag definitions for
+ * Fields in the Java Virtual Machine Specification (Java SE 9
Edition).</a>
+ * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.6";>
Flag definitions for
+ * Methods in the Java Virtual Machine Specification (Java SE 9
Edition).</a>
* @see <a
href="https://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.7.6-300-D.1-D.1";>
Flag
- * definitions for Inner Classes in the Java Virtual Machine
Specification (Java SE 9 Edition).</a>
+ * definitions for Inner Classes in the Java Virtual Machine
Specification (Java SE 9 Edition).</a>
*/
- public static final short ACC_FINAL = 0x0010;
+ public static final short ACC_FINAL = 0x0010;
/**
* One of the access flags for classes: {@value}.
*
* @see #ACC_FINAL
*/
- public static final short ACC_INTERFACE = 0x0200;
+ public static final short ACC_INTERFACE = 0x0200;
/**
* One of the access flags for methods or classes: {@value}.
*
* @see #ACC_FINAL
*/
- public static final short ACC_ABSTRACT = 0x0400;
+ public static final short ACC_ABSTRACT = 0x0400;
/**
* One of the access flags for classes: {@value}.
*
* @see #ACC_FINAL
*/
- public static final short ACC_ANNOTATION = 0x2000;
+ public static final short ACC_ANNOTATION = 0x2000;
/**
* Marks a constant pool entry as type UTF-8: {@value}.
*
- * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.7";>
The Constant Pool in The
- * Java Virtual Machine Specification</a>
+ * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.7";>
The Constant Pool in
+ * The Java Virtual Machine Specification</a>
*/
public static final byte CONSTANT_Utf8 = 1;
/*
- * The description of the constant pool is at:
https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4
- * References below are to the individual sections
+ * The description of the constant pool is at:
+ * https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4
References below are to the individual
+ * sections
*/
/**
* Marks a constant pool entry as type Integer: {@value}.
*
- * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.4";>
The Constant Pool in The
- * Java Virtual Machine Specification</a>
+ * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.4";>
The Constant Pool in
+ * The Java Virtual Machine Specification</a>
*/
public static final byte CONSTANT_Integer = 3;
/**
* Marks a constant pool entry as type Float: {@value}.
*
- * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.4";>
The Constant Pool in The
- * Java Virtual Machine Specification</a>
+ * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.4";>
The Constant Pool in
+ * The Java Virtual Machine Specification</a>
*/
public static final byte CONSTANT_Float = 4;
/**
* Marks a constant pool entry as type Long: {@value}.
*
- * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.5";>
The Constant Pool in The
- * Java Virtual Machine Specification</a>
+ * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.5";>
The Constant Pool in
+ * The Java Virtual Machine Specification</a>
*/
public static final byte CONSTANT_Long = 5;
/**
* Marks a constant pool entry as type Double: {@value}.
*
- * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.5";>
The Constant Pool in The
- * Java Virtual Machine Specification</a>
+ * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.5";>
The Constant Pool in
+ * The Java Virtual Machine Specification</a>
*/
public static final byte CONSTANT_Double = 6;
/**
* Marks a constant pool entry as a Class: {@value}.
*
- * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.1";>
The Constant Pool in The
- * Java Virtual Machine Specification</a>
+ * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.1";>
The Constant Pool in
+ * The Java Virtual Machine Specification</a>
*/
public static final byte CONSTANT_Class = 7;
/**
* Marks a constant pool entry as a Field Reference: {@value}.
*
- * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.2";>
The Constant Pool in The
- * Java Virtual Machine Specification</a>
+ * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.2";>
The Constant Pool in
+ * The Java Virtual Machine Specification</a>
*/
public static final byte CONSTANT_Fieldref = 9;
/**
* Marks a constant pool entry as type String: {@value}.
*
- * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.3";>
The Constant Pool in The
- * Java Virtual Machine Specification</a>
+ * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.3";>
The Constant Pool in
+ * The Java Virtual Machine Specification</a>
*/
public static final byte CONSTANT_String = 8;
/**
* Marks a constant pool entry as a Method Reference: {@value}.
*
- * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.2";>
The Constant Pool in The
- * Java Virtual Machine Specification</a>
+ * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.2";>
The Constant Pool in
+ * The Java Virtual Machine Specification</a>
*/
public static final byte CONSTANT_Methodref = 10;
/**
* Marks a constant pool entry as an Interface Method Reference: {@value}.
*
- * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.2";>
The Constant Pool in The
- * Java Virtual Machine Specification</a>
+ * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.2";>
The Constant Pool in
+ * The Java Virtual Machine Specification</a>
*/
public static final byte CONSTANT_InterfaceMethodref = 11;
/**
* Marks a constant pool entry as a name and type: {@value}.
*
- * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.6";>
The Constant Pool in The
- * Java Virtual Machine Specification</a>
+ * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.6";>
The Constant Pool in
+ * The Java Virtual Machine Specification</a>
*/
public static final byte CONSTANT_NameAndType = 12;
/**
* Marks a constant pool entry as a Method Handle: {@value}.
*
- * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.8";>
The Constant Pool in The
- * Java Virtual Machine Specification</a>
+ * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.8";>
The Constant Pool in
+ * The Java Virtual Machine Specification</a>
*/
public static final byte CONSTANT_MethodHandle = 15;
/**
* Marks a constant pool entry as a Method Type: {@value}.
*
- * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.9";>
The Constant Pool in The
- * Java Virtual Machine Specification</a>
+ * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.9";>
The Constant Pool in
+ * The Java Virtual Machine Specification</a>
*/
public static final byte CONSTANT_MethodType = 16;
/**
* Marks a constant pool entry as dynamically computed: {@value}.
*
- * @see <a
href="https://bugs.openjdk.java.net/secure/attachment/74618/constant-dynamic.html";>
Change request for JEP
- * 309</a>
+ * @see <a
href="https://bugs.openjdk.java.net/secure/attachment/74618/constant-dynamic.html";>
Change request for
+ * JEP 309</a>
*/
public static final byte CONSTANT_Dynamic = 17;
/**
* Marks a constant pool entry as an Invoke Dynamic: {@value}.
*
- * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.10";>
The Constant Pool in The
- * Java Virtual Machine Specification</a>
+ * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.10";>
The Constant Pool in
+ * The Java Virtual Machine Specification</a>
*/
public static final byte CONSTANT_InvokeDynamic = 18;
/**
* Marks a constant pool entry as a Module Reference: {@value}.
*
- * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.4.11";>
The Constant Pool in The
- * Java Virtual Machine Specification</a>
+ * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.4.11";>
The Constant Pool in
+ * The Java Virtual Machine Specification</a>
*/
public static final byte CONSTANT_Module = 19;
/**
* Marks a constant pool entry as a Package Reference: {@value}.
*
- * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.4.12";>
The Constant Pool in The
- * Java Virtual Machine Specification</a>
+ * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.4.12";>
The Constant Pool in
+ * The Java Virtual Machine Specification</a>
*/
public static final byte CONSTANT_Package = 20;
/**
* The names of the types of entries in a constant pool. Use
getConstantName instead
*/
- private static final String[] CONSTANT_NAMES = {"", "CONSTANT_Utf8", "",
"CONSTANT_Integer", "CONSTANT_Float", "CONSTANT_Long", "CONSTANT_Double",
- "CONSTANT_Class", "CONSTANT_String", "CONSTANT_Fieldref",
"CONSTANT_Methodref", "CONSTANT_InterfaceMethodref", "CONSTANT_NameAndType",
"", "",
- "CONSTANT_MethodHandle", "CONSTANT_MethodType",
"CONSTANT_Dynamic", "CONSTANT_InvokeDynamic", "CONSTANT_Module",
"CONSTANT_Package"};
+ private static final String[] CONSTANT_NAMES = { "", "CONSTANT_Utf8", "",
"CONSTANT_Integer", "CONSTANT_Float",
+ "CONSTANT_Long", "CONSTANT_Double", "CONSTANT_Class",
"CONSTANT_String", "CONSTANT_Fieldref",
+ "CONSTANT_Methodref", "CONSTANT_InterfaceMethodref",
"CONSTANT_NameAndType", "", "",
+ "CONSTANT_MethodHandle", "CONSTANT_MethodType",
"CONSTANT_Dynamic", "CONSTANT_InvokeDynamic",
+ "CONSTANT_Module", "CONSTANT_Package" };
/**
* The maximum number of dimensions in an array: {@value}. One of the
limitations of the Java Virtual Machine.
*
- * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.3.2-150";>
Field Descriptors in
- * The Java Virtual Machine Specification</a>
+ * @see <a
href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.3.2-150";>
Field Descriptors
+ * in The Java Virtual Machine Specification</a>
*/
public static final int MAX_ARRAY_DIMENSIONS = 255;
@@ -224,6 +227,7 @@ public final class Const {
* Minor version number of class files for Java 22: {@value}.
*
* @see #MAJOR_22
+ *
* @since 6.10.0
*/
public static final short MINOR_22 = 0;
@@ -232,6 +236,7 @@ public final class Const {
* Minor version number of class files for Java 23: {@value}.
*
* @see #MAJOR_23
+ *
* @since 6.10.0
*/
public static final short MINOR_23 = 0;
@@ -240,6 +245,7 @@ public final class Const {
* Minor version number of class files for Java 24: {@value}.
*
* @see #MAJOR_24
+ *
* @since 6.10.0
*/
public static final short MINOR_24 = 0;
@@ -248,6 +254,7 @@ public final class Const {
* Major version number of class files for Java 22: {@value}.
*
* @see #MINOR_22
+ *
* @since 6.10.0
*/
public static final short MAJOR_22 = 66;
@@ -256,6 +263,7 @@ public final class Const {
* Major version number of class files for Java 23: {@value}.
*
* @see #MINOR_23
+ *
* @since 6.10.0
*/
public static final short MAJOR_23 = 67;
@@ -264,6 +272,7 @@ public final class Const {
* Major version number of class files for Java 24: {@value}.
*
* @see #MINOR_24
+ *
* @since 6.10.0
*/
public static final short MAJOR_24 = 68;
@@ -272,6 +281,7 @@ public final class Const {
* Minor version number of class files for Java 25: {@value}.
*
* @see #MAJOR_25
+ *
* @since 6.11.0
*/
public static final short MINOR_25 = 0;
@@ -280,14 +290,34 @@ public final class Const {
* Major version number of class files for Java 25: {@value}.
*
* @see #MINOR_25
+ *
* @since 6.11.0
*/
public static final short MAJOR_25 = 69;
+ /**
+ * Minor version number of class files for Java 26: {@value}.
+ *
+ * @see #MAJOR_26
+ *
+ * @since 6.12.0
+ */
+ public static final short MINOR_26 = 0;
+
+ /**
+ * Major version number of class files for Java 26: {@value}.
+ *
+ * @see #MINOR_26
+ *
+ * @since 6.12.0
+ */
+ public static final short MAJOR_26 = 70;
+
/**
* Get the CONSTANT_NAMES entry at the given index.
*
* @param index index into {@code CONSTANT_NAMES}.
+ *
* @return the CONSTANT_NAMES entry at the given index
*/
public static String getConstantName(final int index) {
diff --git
a/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
b/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
index db09a573d6..964ef73dbd 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
@@ -28,6 +28,11 @@ public class AnnotationElementValue extends ElementValue {
this.annotationEntry = annotationEntry;
}
+ /**
+ * Gets the annotation entry.
+ *
+ * @return the annotation entry.
+ */
public AnnotationEntry getAnnotationEntry() {
return annotationEntry;
}
diff --git a/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
b/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
index 52e6a6206b..adf07110b6 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
@@ -55,14 +55,18 @@ public class AnnotationEntry {
}
/**
- * @return the annotation type name
+ * Gets the annotation type name.
+ *
+ * @return the annotation type name.
*/
public String getAnnotationType() {
return constantPool.getConstantUtf8(typeIndex).getBytes();
}
/**
- * @return the element value pairs in this annotation entry
+ * Gets the element value pairs in this annotation entry.
+ *
+ * @return the element value pairs in this annotation entry.
*/
public List<ElementValuePair> getElementValuePairs() {
return elementValuePairs;
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
b/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
index 7332c1f604..ba4cd9ff8f 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
@@ -60,31 +60,31 @@ public final class ClassParser {
/**
- * Parses the given Java class file and return an object that represents
the contained data, i.e., constants, methods,
+ * Parses the given Java class file and return an object that represents
the contained data, that is, constants, methods,
* fields and commands. A <em>ClassFormatException</em> is raised, if the
file is not a valid .class file. (This does
* not include verification of the byte code as it is performed by the
Java interpreter).
*
- * @return Class object representing the parsed class file
+ * @return Class object representing the parsed class file.
* @throws IOException if an I/O error occurs.
- * @throws ClassFormatException if a class is malformed or cannot be
interpreted as a class file
+ * @throws ClassFormatException if a class is malformed or cannot be
interpreted as a class file.
*/
public JavaClass parse() throws IOException, ClassFormatException {
- //****************** Read headers ********************************
+ // -- Read headers --
// Check magic tag of class file
readID();
// Get compiler version
readVersion();
- //***************** Read constant pool and related **************
+ // -- Read constant pool and related **************/
// Read constant pool entries
readConstantPool();
// Get class information
readClassInfo();
- // Get interface information, i.e., implemented interfaces
+ // Get interface information, that is, implemented interfaces
readInterfaces();
- //***************** Read class fields and methods ***************
- // Read class fields, i.e., the variables of the class
+ // -- Read class fields and methods --
+ // Read class fields, that is, the variables of the class
readFields();
- // Read class methods, i.e., the functions in the class
+ // Read class methods, that is, the functions in the class
readMethods();
// Read class attributes
readAttributes(false);
@@ -99,7 +99,7 @@ public final class ClassParser {
* Reads information about the attributes of the class.
* @param fieldOrMethod false if processing a class
* @throws IOException if an I/O error occurs.
- * @throws ClassFormatException if a class is malformed or cannot be
interpreted as a class file
+ * @throws ClassFormatException if a class is malformed or cannot be
interpreted as a class file.
*/
private void readAttributes(boolean fieldOrMethod) throws IOException,
ClassFormatException {
final int attributesCount = dataInputStream.readUnsignedShort();
@@ -141,7 +141,7 @@ public final class ClassParser {
* Reads information about the class and its super class.
*
* @throws IOException if an I/O error occurs.
- * @throws ClassFormatException if a class is malformed or cannot be
interpreted as a class file
+ * @throws ClassFormatException if a class is malformed or cannot be
interpreted as a class file.
*/
private void readClassInfo() throws IOException, ClassFormatException {
accessFlags = dataInputStream.readUnsignedShort();
@@ -254,7 +254,7 @@ public final class ClassParser {
* Reads major and minor version of compiler which created the file.
*
* @throws IOException if an I/O error occurs.
- * @throws ClassFormatException if a class is malformed or cannot be
interpreted as a class file
+ * @throws ClassFormatException if a class is malformed or cannot be
interpreted as a class file.
*/
private void readVersion() throws IOException, ClassFormatException {
// file.readUnsignedShort(); // Unused minor
diff --git a/java/org/apache/tomcat/util/bcel/classfile/Constant.java
b/java/org/apache/tomcat/util/bcel/classfile/Constant.java
index 39bb3fb0b6..ced2a5dea4 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/Constant.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/Constant.java
@@ -30,8 +30,8 @@ public abstract class Constant {
/**
* Reads one constant from the given input, the type depends on a tag byte.
*
- * @param dataInput Input stream
- * @return Constant object
+ * @param dataInput Input stream.
+ * @return Constant object.
* @throws IOException if an I/O error occurs reading from the given
{@code dataInput}.
* @throws ClassFormatException if the next byte is not recognized
*/
@@ -89,7 +89,9 @@ public abstract class Constant {
}
/**
- * @return Tag of constant, i.e., its type. No setTag() method to avoid
confusion.
+ * Gets the tag of constant.
+ *
+ * @return Tag of constant, that is, its type. No setTag() method to avoid
confusion.
*/
public final byte getTag() {
return tag;
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
index 9f62473294..2ab13a405f 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
@@ -34,7 +34,7 @@ public final class ConstantClass extends Constant {
/**
* Constructs an instance from file data.
*
- * @param dataInput Input stream
+ * @param dataInput Input stream.
* @throws IOException if an I/O error occurs reading from the given
{@code dataInput}.
*/
ConstantClass(final DataInput dataInput) throws IOException {
@@ -44,6 +44,8 @@ public final class ConstantClass extends Constant {
/**
+ * Gets the name index in constant pool of class name.
+ *
* @return Name index in constant pool of class name.
*/
public int getNameIndex() {
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
index 4641526c7e..907e3907ea 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
@@ -34,7 +34,7 @@ public final class ConstantDouble extends Constant {
/**
* Initialize instance from file data.
*
- * @param file Input stream
+ * @param file Input stream.
* @throws IOException if an I/O error occurs.
*/
ConstantDouble(final DataInput file) throws IOException {
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
index 69bfffdcb5..7e44000e7f 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
@@ -34,7 +34,7 @@ public final class ConstantFloat extends Constant {
/**
* Initialize instance from file data.
*
- * @param file Input stream
+ * @param file Input stream.
* @throws IOException if an I/O error occurs.
*/
ConstantFloat(final DataInput file) throws IOException {
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
index f3c4d2dde4..c71af8d32c 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
@@ -34,7 +34,7 @@ public final class ConstantInteger extends Constant {
/**
* Initialize instance from file data.
*
- * @param file Input stream
+ * @param file Input stream.
* @throws IOException if an I/O error occurs.
*/
ConstantInteger(final DataInput file) throws IOException {
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
index 6d0d609c0c..ed4fa6d9de 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
@@ -34,7 +34,7 @@ public final class ConstantLong extends Constant {
/**
* Initialize instance from file data.
*
- * @param file Input stream
+ * @param file Input stream.
* @throws IOException if an I/O error occurs.
*/
ConstantLong(final DataInput file) throws IOException {
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
index 04ef05a58c..083c0465f2 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
@@ -22,7 +22,7 @@ import java.io.IOException;
import org.apache.tomcat.util.bcel.Const;
/**
- * This class represents the constant pool, i.e., a table of constants, of a
parsed classfile. It may contain null references, due to the JVM specification
that
+ * This class represents the constant pool, that is, a table of constants, of
a parsed classfile. It may contain null references, due to the JVM
specification that
* skips an entry after an 8-byte constant (double, long) entry. Those
interested in generating constant pools programmatically should see
* <a href="../generic/ConstantPoolGen.html"> ConstantPoolGen</a>.
*
diff --git a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
index 65976775dd..94440b3531 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
@@ -20,7 +20,7 @@ import java.util.HashMap;
import java.util.List;
/**
- * Represents a Java class, i.e., the data structures, constant pool, fields,
methods and commands contained in a Java
+ * Represents a Java class, that is, the data structures, constant pool,
fields, methods and commands contained in a Java
* .class file. See <a href="https://docs.oracle.com/javase/specs/";>JVM
specification</a> for details. The intent of
* this class is to represent a parsed or otherwise existing class file. Those
interested in programmatically generating
* classes should see the <a href="../generic/ClassGen.html">ClassGen</a>
class.
diff --git a/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
b/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
index ee2c53720c..678be8a6dc 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
@@ -27,7 +27,7 @@ public class SimpleElementValue extends ElementValue {
}
/**
- * @return Value entry index in the cpool
+ * @return Value entry index in the constant pool.
*/
public int getIndex() {
return index;
diff --git a/java/org/apache/tomcat/util/bcel/package-info.java
b/java/org/apache/tomcat/util/bcel/package-info.java
index 91b01921eb..cac47b0181 100644
--- a/java/org/apache/tomcat/util/bcel/package-info.java
+++ b/java/org/apache/tomcat/util/bcel/package-info.java
@@ -16,7 +16,7 @@
*/
/**
- * Basic classes for the <a href="https://commons.apache.org/bcel/";>Apache
Byte Code Engineering Library (BCEL)</a> and constants defined by the
- * <a href="https://docs.oracle.com/javase/specs/";> JVM specification</a>.
+ * Basic classes for the <a href="https://commons.apache.org/bcel/";>Apache
Byte Code Engineering Library (BCEL)</a> and
+ * constants defined by the <a href="https://docs.oracle.com/javase/specs/";>
JVM specification</a>.
*/
package org.apache.tomcat.util.bcel;
\ No newline at end of file
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6f87a0773f..ead0d221e9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -352,6 +352,9 @@
Update Derby to 10.17.1.0. (markt)
</update>
<!-- Entries for backport and removal before 12.0.0-M1 below this line
-->
+ <update>
+ Update the internal fork of Apache Commons BCEL to 6.12.0. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
