This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 96b6c773a5 Fix missing attributes
96b6c773a5 is described below
commit 96b6c773a5c0991229a74d133615f7c08e7c6e97
Author: remm <r...@apache.org>
AuthorDate: Thu Sep 22 22:56:19 2022 +0200
Fix missing attributes
The code is very confusing, but the main attribute map can contain
either the get or set method as the value, so it must not be used. This
should probably be refactored some more ...
---
.../modeler/modules/MbeansDescriptorsIntrospectionSource.java | 2 +-
webapps/docs/changelog.xml | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
index 05f393d023..ffb0937066 100644
---
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
+++
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
@@ -311,7 +311,7 @@ public class MbeansDescriptorsIntrospectionSource extends
ModelerSource
String name = attEntry.getKey();
AttributeInfo ai = new AttributeInfo();
ai.setName(name);
- Method gm = attEntry.getValue();
+ Method gm = getAttMap.get(name);
if (gm != null) {
ai.setGetMethod(gm.getName());
Class<?> t = gm.getReturnType();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2b710b0d76..807650bb38 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 10.0.26 (markt)" rtext="in development">
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ Fix a regression in refactoring for Hashtables which caused mbeans to
+ lose many of their attributes. (remm)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 10.0.25 (markt)" rtext="release in progress">
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
