From dev-return-194895-archive-asf-public=cust-asf.ponee.io@tomcat.apache.org Fri Nov 16 20:28:21 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 7A46A180670 for ; Fri, 16 Nov 2018 20:28:20 +0100 (CET) Received: (qmail 22452 invoked by uid 500); 16 Nov 2018 19:28:19 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 22442 invoked by uid 99); 16 Nov 2018 19:28:19 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Nov 2018 19:28:19 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id BF90D3A05B6 for ; Fri, 16 Nov 2018 19:28:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1846750 - in /tomcat/trunk: java/org/apache/catalina/manager/StatusManagerServlet.java webapps/docs/changelog.xml Date: Fri, 16 Nov 2018 19:28:18 -0000 To: dev@tomcat.apache.org From: remm@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20181116192818.BF90D3A05B6@svn01-us-west.apache.org> 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 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) + + 62918: Filter out subtype mbeans to avoid breaking the + connector status page. (remm) + --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org