This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new a83e3ad Sync with latest Commons BCEL changes
a83e3ad is described below
commit a83e3adc2361ee2147c41adedf8aad2a128de77a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Sep 1 12:08:21 2021 +0100
Sync with latest Commons BCEL changes
Code formatting only.
---
MERGE.txt | 2 +-
java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java | 2 +-
java/org/apache/tomcat/util/bcel/classfile/ClassParser.java | 4 ++--
java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java | 2 +-
webapps/docs/changelog.xml | 4 ++++
5 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index 806669a..1948af3 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -36,7 +36,7 @@ BCEL
Sub-tree:
src/main/java/org/apache/bcel
The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-4637826ac76db6cd4ff7eb56d1b13e16d4b43320 (2021-01-15)
+40d5eb4eda290c74b533f389fbc4e3495a4513f6 (2021-09-01)
Codec
-----
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
b/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
index caff880..8377707 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
@@ -40,7 +40,7 @@ public class ArrayElementValue extends ElementValue
for (int i = 0; i < elementValues.length; i++)
{
sb.append(elementValues[i].stringifyValue());
- if ((i + 1) < elementValues.length) {
+ if (i + 1 < elementValues.length) {
sb.append(',');
}
}
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
b/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
index af24856..3e18993 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
@@ -158,8 +158,8 @@ public final class ClassParser {
if ((accessFlags & Const.ACC_INTERFACE) != 0) {
accessFlags |= Const.ACC_ABSTRACT;
}
- if (((accessFlags & Const.ACC_ABSTRACT) != 0)
- && ((accessFlags & Const.ACC_FINAL) != 0)) {
+ if ((accessFlags & Const.ACC_ABSTRACT) != 0
+ && (accessFlags & Const.ACC_FINAL) != 0) {
throw new ClassFormatException("Class can't be both final and
abstract");
}
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
index f3ab072..81280c3 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
@@ -60,7 +60,7 @@ public class ConstantPool {
*/
if (constantPool[i] != null) {
byte tag = constantPool[i].getTag();
- if ((tag == Const.CONSTANT_Double) || (tag ==
Const.CONSTANT_Long)) {
+ if (tag == Const.CONSTANT_Double || tag ==
Const.CONSTANT_Long) {
i++;
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9ba7d76..e5000c0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -184,6 +184,10 @@
Update to JSign version 4.0 to enable code signing without the need for
the installation of additional client tools. (markt)
</update>
+ <add>
+ Update the internal fork of Apache Commons BCEL to 40d5eb4 (2021-09-01,
+ 6.6.0-SNAPSHOT). 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
