This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 9960cc1ade Only use pre-Java 21 work-around when required.
9960cc1ade is described below
commit 9960cc1ade8b64142190488b0059128a1855eccb
Author: Mark Thomas <[email protected]>
AuthorDate: Thu May 21 08:10:29 2026 +0100
Only use pre-Java 21 work-around when required.
---
java/jakarta/el/BeanSupportFull.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/java/jakarta/el/BeanSupportFull.java
b/java/jakarta/el/BeanSupportFull.java
index ac35a3b1ff..849e2bdc9a 100644
--- a/java/jakarta/el/BeanSupportFull.java
+++ b/java/jakarta/el/BeanSupportFull.java
@@ -48,7 +48,9 @@ class BeanSupportFull extends BeanSupport {
* This bug is fixed in Java 21 b21. This workaround can be
removed once the minimum Java version is 21.
* Populating from any interfaces causes default methods to be
included.
*/
- populateFromInterfaces(type);
+ if (Runtime.version().feature() < 21) {
+ populateFromInterfaces(type);
+ }
} catch (IntrospectionException ie) {
throw new ELException(ie);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
