This is an automated email from the ASF dual-hosted git repository.
remm 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 f083fcc Skip interfaces for HandlesTypes
f083fcc is described below
commit f083fcccc65b20c108994300af8cd83e730851a0
Author: remm <[email protected]>
AuthorDate: Tue Apr 20 15:54:17 2021 +0200
Skip interfaces for HandlesTypes
BZ 65256.
Although a bit unclear in the specification, I don't see a use for
returning interfaces.
---
java/org/apache/catalina/startup/ContextConfig.java | 7 ++++---
webapps/docs/changelog.xml | 4 ++++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/startup/ContextConfig.java
b/java/org/apache/catalina/startup/ContextConfig.java
index dd980a6..3db02f3 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -2051,9 +2051,10 @@ public class ContextConfig implements LifecycleListener {
return;
}
- if ((javaClass.getAccessFlags() &
- org.apache.tomcat.util.bcel.Const.ACC_ANNOTATION) != 0) {
- // Skip annotations.
+ if ((javaClass.getAccessFlags()
+ & (org.apache.tomcat.util.bcel.Const.ACC_ANNOTATION
+ | org.apache.tomcat.util.bcel.Const.ACC_INTERFACE)) !=
0) {
+ // Skip annotations or interfaces
return;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9643360..b3293fa 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -125,6 +125,10 @@
resulting in one of the deployments failing and errors being reported.
(markt)
</fix>
+ <fix>
+ <bug>65256</bug>: HandlesTypes class sets should not include
+ interfaces. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
