[tomcat] 01/02: Adds "javax.annotation" to filter

[markt]

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

commit 589ebcee2a53034edf735f060bfeb4e506ca6df2
Author: Piotr P. Karwasz <piotr.git...@karwasz.org>
AuthorDate: Fri Jan 28 09:33:04 2022 +0100

    Adds "javax.annotation" to filter
    
    Some users from mistakenly add `javax.annotation-api` to their
    applications, which prevents Tomcat from finding @Resource and similar
    annotations on the servlets.
    
    To prevent this "javax.annotation" should also be always loaded from
    the common classloader.
---
 java/org/apache/catalina/loader/WebappClassLoaderBase.java | 6 ++++--
 test/org/apache/catalina/loader/TestWebappClassLoader.java | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index e6f70a8..3d0ac44 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -2617,7 +2617,8 @@ public abstract class WebappClassLoaderBase extends 
URLClassLoader
                 if (name.startsWith("servlet.jsp.jstl.", 6)) {
                     return false;
                 }
-                if (name.startsWith("el.", 6) ||
+                if (name.startsWith("annotation.", 6) ||
+                    name.startsWith("el.", 6) ||
                     name.startsWith("servlet.", 6) ||
                     name.startsWith("websocket.", 6) ||
                     name.startsWith("security.auth.message.", 6)) {
@@ -2628,7 +2629,8 @@ public abstract class WebappClassLoaderBase extends 
URLClassLoader
                 if (name.startsWith("servlet/jsp/jstl/", 6)) {
                     return false;
                 }
-                if (name.startsWith("el/", 6) ||
+                if (name.startsWith("annotation/", 6) ||
+                    name.startsWith("el/", 6) ||
                     name.startsWith("servlet/", 6) ||
                     name.startsWith("websocket/", 6) ||
                     name.startsWith("security/auth/message/", 6)) {
diff --git a/test/org/apache/catalina/loader/TestWebappClassLoader.java 
b/test/org/apache/catalina/loader/TestWebappClassLoader.java
index a81d4c6..b4c2b87 100644
--- a/test/org/apache/catalina/loader/TestWebappClassLoader.java
+++ b/test/org/apache/catalina/loader/TestWebappClassLoader.java
@@ -98,6 +98,7 @@ public class TestWebappClassLoader extends TomcatBaseTest {
             "org.apache.juli",
             "org.apache.naming",
             "org.apache.tomcat",
+            "javax.annotation",
             "javax.el",
             "javax.servlet",
             "javax.websocket",

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org