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 fecda18 Revert due to uncertainty about the behavior
fecda18 is described below
commit fecda18595c1ee2dabb1de20311b96b49ffbbff9
Author: remm <r...@apache.org>
AuthorDate: Tue Apr 20 20:49:01 2021 +0200
Revert due to uncertainty about the behavior
---
java/org/apache/catalina/startup/ContextConfig.java | 7 +++----
webapps/docs/changelog.xml | 4 ----
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/catalina/startup/ContextConfig.java
b/java/org/apache/catalina/startup/ContextConfig.java
index 3db02f3..dd980a6 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -2051,10 +2051,9 @@ public class ContextConfig implements LifecycleListener {
return;
}
- if ((javaClass.getAccessFlags()
- & (org.apache.tomcat.util.bcel.Const.ACC_ANNOTATION
- | org.apache.tomcat.util.bcel.Const.ACC_INTERFACE)) !=
0) {
- // Skip annotations or interfaces
+ if ((javaClass.getAccessFlags() &
+ org.apache.tomcat.util.bcel.Const.ACC_ANNOTATION) != 0) {
+ // Skip annotations.
return;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b3293fa..9643360 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -125,10 +125,6 @@
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
