You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2021/04/20 14:40:42 UTC

[tomcat] branch 9.0.x updated: Skip interfaces for HandlesTypes

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 8de2534  Skip interfaces for HandlesTypes
8de2534 is described below

commit 8de253478bc153c1f0055a79ae4cba4639928d1e
Author: remm <re...@apache.org>
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 8172a3b..8018d70 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -2383,9 +2383,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 bf65ff6..cbdbd8e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -129,6 +129,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: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org