On Wed, May 20, 2026 at 10:36 AM <[email protected]> wrote:
>
> This is an automated email from the ASF dual-hosted git repository.
>
> markt-asf pushed a commit to branch main
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/main by this push:
> new 39467683b2 Remove unnecessary code
> 39467683b2 is described below
>
> commit 39467683b2742443811b52a79123e050fae45b5f
> Author: Mark Thomas <[email protected]>
> AuthorDate: Wed May 20 09:35:44 2026 +0100
>
> Remove unnecessary code
Thanks !
Rémy
> ---
> java/jakarta/el/BeanSupportStandalone.java | 21 ---------------------
> webapps/docs/changelog.xml | 3 ---
> 2 files changed, 24 deletions(-)
>
> diff --git a/java/jakarta/el/BeanSupportStandalone.java
> b/java/jakarta/el/BeanSupportStandalone.java
> index 07a65b9c24..e840ef75d8 100644
> --- a/java/jakarta/el/BeanSupportStandalone.java
> +++ b/java/jakarta/el/BeanSupportStandalone.java
> @@ -172,27 +172,6 @@ class BeanSupportStandalone extends BeanSupport {
> for (PropertyDescriptor pd : pds) {
> this.properties.put(pd.getName(), new
> BeanPropertyStandalone(type, pd));
> }
> - /*
> - * Populating from any interfaces causes default methods to be
> included.
> - */
> - populateFromInterfaces(type);
> - }
> -
> - private void populateFromInterfaces(Class<?> aClass) {
> - Class<?>[] interfaces = aClass.getInterfaces();
> - for (Class<?> ifs : interfaces) {
> - PropertyDescriptor[] pds = getPropertyDescriptors(ifs);
> - for (PropertyDescriptor pd : pds) {
> - if (!this.properties.containsKey(pd.getName())) {
> - this.properties.put(pd.getName(), new
> BeanPropertyStandalone(this.type, pd));
> - }
> - }
> - populateFromInterfaces(ifs);
> - }
> - Class<?> superclass = aClass.getSuperclass();
> - if (superclass != null) {
> - populateFromInterfaces(superclass);
> - }
> }
> }
>
> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
> index d714e4edc3..3e60905506 100644
> --- a/webapps/docs/changelog.xml
> +++ b/webapps/docs/changelog.xml
> @@ -326,9 +326,6 @@
> (markt)
> </add>
> <!-- Entries for backport and removal before 12.0.0-M1 below this line
> -->
> - <fix>
> - Fix EL standalone interface bean properties discovery. (remm)
> - </fix>
> <fix>
> Fix possible EL argument mismatch when it was set to null. (remm)
> </fix>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [email protected]
> For additional commands, e-mail: [email protected]
>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
