This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5891f48f1d88421ae76fa1a9bf9fbc5fbd764566 Author: Mark Thomas <ma...@apache.org> AuthorDate: Fri May 3 14:52:23 2024 +0100 Removed attributes also need to be removed from MBeans. Based on PR #719 provided by Shawn Q. --- .../apache/catalina/session/mbeans-descriptors.xml | 8 ------- .../apache/tomcat/util/net/mbeans-descriptors.xml | 27 ---------------------- webapps/docs/changelog.xml | 4 ++++ 3 files changed, 4 insertions(+), 35 deletions(-) diff --git a/java/org/apache/catalina/session/mbeans-descriptors.xml b/java/org/apache/catalina/session/mbeans-descriptors.xml index f46cf0c6d1..a1161c0c28 100644 --- a/java/org/apache/catalina/session/mbeans-descriptors.xml +++ b/java/org/apache/catalina/session/mbeans-descriptors.xml @@ -36,10 +36,6 @@ type="java.lang.String" writeable="false"/> - <attribute name="duplicates" - description="Number of duplicated session ids generated" - type="int" /> - <attribute name="expiredSessions" description="Number of sessions that expired ( doesn't include explicit invalidations )" type="long" /> @@ -224,10 +220,6 @@ type="java.lang.String" writeable="false"/> - <attribute name="duplicates" - description="Number of duplicated session ids generated" - type="int" /> - <attribute name="expiredSessions" description="Number of sessions that expired ( doesn't include explicit invalidations )" type="long" /> diff --git a/java/org/apache/tomcat/util/net/mbeans-descriptors.xml b/java/org/apache/tomcat/util/net/mbeans-descriptors.xml index 38713f8922..c99a31d88d 100644 --- a/java/org/apache/tomcat/util/net/mbeans-descriptors.xml +++ b/java/org/apache/tomcat/util/net/mbeans-descriptors.xml @@ -29,17 +29,9 @@ <attribute name="acceptCount" type="int"/> - <attribute name="acceptorThreadCount" - type="int"/> - <attribute name="acceptorThreadPriority" type="int"/> - <attribute name="alpnSupported" - type="boolean" - writeable="false" - is="true"/> - <attribute name="bindOnInit" type="boolean"/> @@ -67,10 +59,6 @@ <attribute name="defaultSSLHostConfigName" type="java.lang.String"/> - <attribute name="deferAccept" - type="boolean" - writeable="false"/> - <attribute name="domain" type="java.lang.String"/> @@ -112,9 +100,6 @@ writeable="false" is="true"/> - <attribute name="pollerThreadCount" - type="int"/> - <attribute name="pollerThreadPriority" type="int"/> @@ -259,17 +244,9 @@ <attribute name="acceptCount" type="int"/> - <attribute name="acceptorThreadCount" - type="int"/> - <attribute name="acceptorThreadPriority" type="int"/> - <attribute name="alpnSupported" - type="boolean" - writeable="false" - is="true"/> - <attribute name="bindOnInit" type="boolean"/> @@ -297,10 +274,6 @@ <attribute name="defaultSSLHostConfigName" type="java.lang.String"/> - <attribute name="deferAccept" - type="boolean" - writeable="false"/> - <attribute name="domain" type="java.lang.String"/> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 70bb21df9d..472c2ff1d1 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -152,6 +152,10 @@ <fix> Extend <code>Asn1Parser</code> to parse <code>UTF8String</code>s. (michaelo) </fix> + <fix> + Remove MBean metadata for attibutes that have been removed. Based on + <pr>719</pr> by Shawn Q. (markt) + </fix> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org