This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 7f9e8b1aa348f206d390c48bcc700662fe979818
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Dec 6 14:18:15 2019 +0000
Merge in BCEL changes to ff6941e (2019-12-06, 6.4.2-dev)
---
java/org/apache/tomcat/util/bcel/Const.java | 14 ++++++++------
.../apache/tomcat/util/bcel/classfile/ConstantClass.java | 2 +-
.../apache/tomcat/util/bcel/classfile/ConstantDouble.java | 2 +-
.../apache/tomcat/util/bcel/classfile/ConstantFloat.java | 2 +-
.../apache/tomcat/util/bcel/classfile/ConstantInteger.java | 2 +-
.../apache/tomcat/util/bcel/classfile/ConstantLong.java | 2 +-
webapps/docs/changelog.xml | 4 ++++
7 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/java/org/apache/tomcat/util/bcel/Const.java
b/java/org/apache/tomcat/util/bcel/Const.java
index 402b304..bfaeb42 100644
--- a/java/org/apache/tomcat/util/bcel/Const.java
+++ b/java/org/apache/tomcat/util/bcel/Const.java
@@ -23,12 +23,14 @@ package org.apache.tomcat.util.bcel;
public final class Const {
/** One of the access flags for fields, methods, or classes.
- * @see <a
href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.5";>
- * Flag definitions for Fields in the Java Virtual Machine Specification
(Java SE 8 Edition).</a>
- * @see <a
href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.6";>
- * Flag definitions for Methods in the Java Virtual Machine Specification
(Java SE 8 Edition).</a>
- * @see <a
href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.6-300-D.1-D.1";>
- * Flag definitions for Classes in the Java Virtual Machine Specification
(Java SE 8 Edition).</a>
+ * @see <a
href="http://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="http://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="http://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="http://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>
*/
public static final short ACC_FINAL = 0x0010;
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
index 86e7262..4bce5cc 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
@@ -48,7 +48,7 @@ public final class ConstantClass extends Constant {
/**
* @return Name index in constant pool of class name.
*/
- public final int getNameIndex() {
+ public int getNameIndex() {
return name_index;
}
}
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
index 5ba7fcc..1152dbd 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
@@ -48,7 +48,7 @@ public final class ConstantDouble extends Constant {
/**
* @return data, i.e., 8 bytes.
*/
- public final double getBytes() {
+ public double getBytes() {
return bytes;
}
}
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
index f372bb9..1fd2450 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
@@ -48,7 +48,7 @@ public final class ConstantFloat extends Constant {
/**
* @return data, i.e., 4 bytes.
*/
- public final float getBytes() {
+ public float getBytes() {
return bytes;
}
}
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
index f2c1ba8..0d95983 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
@@ -48,7 +48,7 @@ public final class ConstantInteger extends Constant {
/**
* @return data, i.e., 4 bytes.
*/
- public final int getBytes() {
+ public int getBytes() {
return bytes;
}
}
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
index d7b245c..d7affef 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
@@ -48,7 +48,7 @@ public final class ConstantLong extends Constant {
/**
* @return data, i.e., 8 bytes.
*/
- public final long getBytes() {
+ public long getBytes() {
return bytes;
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b09bd6c..2e9cce6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -157,6 +157,10 @@
Expand the coverage of the Chinese translations provided with Apache
Tomcat. Contributions provided by lins and 磊. (markt)
</add>
+ <add>
+ Update the internal fork of Apache Commons BCEL to ff6941e (2019-12-06,
+ 6.4.2-dev). Code clean-up only. (markt)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
