[tomcat] 02/02: Filtering is no longer necessary now SocketProperties is separate type

2020-04-06 Thread remm 
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 0e76570b07dcad5a4da3fedaee053b0e37fdb1a5
Author: Mark Thomas 
AuthorDate: Mon Apr 6 16:14:39 2020 +0100

Filtering is no longer necessary now SocketProperties is separate type
---
 java/org/apache/catalina/manager/StatusManagerServlet.java | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/manager/StatusManagerServlet.java 
b/java/org/apache/catalina/manager/StatusManagerServlet.java
index 1fc7be2..ec02588 100644
--- a/java/org/apache/catalina/manager/StatusManagerServlet.java
+++ b/java/org/apache/catalina/manager/StatusManagerServlet.java
@@ -119,15 +119,10 @@ 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();
-if (!set2.contains(oi)) {
-threadPools.addElement(oi.getObjectName());
-}
+threadPools.addElement(oi.getObjectName());
 }
 
 // Query Global Request Processors


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/02: Filtering is no longer necessary now SocketProperties is separate type

2020-04-06 Thread remm 
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 5ef320c286412f76891fe4d176ae52505d2ac8a6
Author: Mark Thomas 
AuthorDate: Mon Apr 6 16:14:39 2020 +0100

Filtering is no longer necessary now SocketProperties is separate type
---
 java/org/apache/catalina/manager/StatusManagerServlet.java | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/manager/StatusManagerServlet.java 
b/java/org/apache/catalina/manager/StatusManagerServlet.java
index 1fc7be2..ec02588 100644
--- a/java/org/apache/catalina/manager/StatusManagerServlet.java
+++ b/java/org/apache/catalina/manager/StatusManagerServlet.java
@@ -119,15 +119,10 @@ 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();
-if (!set2.contains(oi)) {
-threadPools.addElement(oi.getObjectName());
-}
+threadPools.addElement(oi.getObjectName());
 }
 
 // Query Global Request Processors


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org