File tomcat-9.0-jmx-maxThreads-bug62918.patch of Package tomcat.10505
@@ -, +, @@
connector status page
---
java/org/apache/catalina/manager/StatusManagerServlet.java | 7 ++++++-
webapps/docs/changelog.xml | 4 ++++
2 files changed, 10 insertions(+), 1 deletion(-)
Index: apache-tomcat-9.0.12-src/java/org/apache/catalina/manager/StatusManagerServlet.java
===================================================================
--- apache-tomcat-9.0.12-src.orig/java/org/apache/catalina/manager/StatusManagerServlet.java
+++ apache-tomcat-9.0.12-src/java/org/apache/catalina/manager/StatusManagerServlet.java
@@ -119,10 +119,15 @@ public class StatusManagerServlet
onStr = "*:type=ThreadPool,*";
objectName = new ObjectName(onStr);
set = mBeanServer.queryMBeans(objectName, null);
+ onStr = "*:type=ThreadPool,*,subType=SocketProperties";
+ objectName = new ObjectName(onStr);
+ Set<ObjectInstance> set2 = mBeanServer.queryMBeans(objectName, null);
iterator = set.iterator();
while (iterator.hasNext()) {
ObjectInstance oi = iterator.next();
- threadPools.addElement(oi.getObjectName());
+ if (!set2.contains(oi)) {
+ threadPools.addElement(oi.getObjectName());
+ }
}
// Query Global Request Processors
Index: apache-tomcat-9.0.12-src/webapps/docs/changelog.xml
===================================================================
--- apache-tomcat-9.0.12-src.orig/webapps/docs/changelog.xml
+++ apache-tomcat-9.0.12-src/webapps/docs/changelog.xml
@@ -131,6 +131,10 @@
translations in addition to English. Patch provided by Artem Chebykin.
(markt)
</add>
+ <fix>
+ <bug>62918</bug>: Filter out subtype mbeans to avoid breaking the
+ connector status page. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">