You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2018/11/16 19:28:18 UTC
svn commit: r1846750 - in /tomcat/trunk:
java/org/apache/catalina/manager/StatusManagerServlet.java
webapps/docs/changelog.xml
Author: remm
Date: Fri Nov 16 19:28:17 2018
New Revision: 1846750
URL: http://svn.apache.org/viewvc?rev=1846750&view=rev
Log:
62918: Filter out subtype mbeans to avoid breaking the connector status page
Modified:
tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java?rev=1846750&r1=1846749&r2=1846750&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java Fri Nov 16 19:28:17 2018
@@ -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
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1846750&r1=1846749&r2=1846750&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Nov 16 19:28:17 2018
@@ -136,6 +136,10 @@
server to use when uploading a web application for deployment with the
Manager web application. Patch provided by Anton Lindström. (markt)
</add>
+ <fix>
+ <bug>62918</bug>: Filter out subtype mbeans to avoid breaking the
+ connector status page. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Tribes">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org