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 2020/04/06 15:32:59 UTC
[tomcat] branch 9.0.x updated (b7d9b2f -> 5ef320c)
This is an automated email from the ASF dual-hosted git repository.
remm pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from b7d9b2f Use a constant for the data size
new c5d20f3 Use a separate mbean type for SocketProperties
new 5ef320c Filtering is no longer necessary now SocketProperties is separate type
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/catalina/manager/StatusManagerServlet.java | 7 +------
java/org/apache/tomcat/util/net/AbstractEndpoint.java | 2 +-
test/org/apache/catalina/mbeans/TestRegistration.java | 5 ++---
webapps/docs/changelog.xml | 8 ++++++++
4 files changed, 12 insertions(+), 10 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Use a separate mbean type for SocketProperties
Posted by re...@apache.org.
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 c5d20f3dba03c5759142423be8a268eab89e0a66
Author: remm <re...@apache.org>
AuthorDate: Mon Apr 6 13:36:10 2020 +0200
Use a separate mbean type for SocketProperties
A subType seems to not be handled well by some tools so it's likely more
robust to avoid it. Inspired by BZ64314, and similarly I cannot see the
mbean in visualvm.
---
java/org/apache/tomcat/util/net/AbstractEndpoint.java | 2 +-
test/org/apache/catalina/mbeans/TestRegistration.java | 5 ++---
webapps/docs/changelog.xml | 8 ++++++++
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index db9fa70..fdb172d 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -1160,7 +1160,7 @@ public abstract class AbstractEndpoint<S,U> {
Registry.getRegistry(null, null).registerComponent(this, oname, null);
ObjectName socketPropertiesOname = new ObjectName(domain +
- ":type=ThreadPool,name=\"" + getName() + "\",subType=SocketProperties");
+ ":type=SocketProperties,name=\"" + getName() + "\"");
socketProperties.setObjectName(socketPropertiesOname);
Registry.getRegistry(null, null).registerComponent(socketProperties, socketPropertiesOname, null);
diff --git a/test/org/apache/catalina/mbeans/TestRegistration.java b/test/org/apache/catalina/mbeans/TestRegistration.java
index 2049f81..bffd2c5 100644
--- a/test/org/apache/catalina/mbeans/TestRegistration.java
+++ b/test/org/apache/catalina/mbeans/TestRegistration.java
@@ -135,9 +135,8 @@ public class TestRegistration extends TomcatBaseTest {
+ ObjectName.quote(ADDRESS),
"Tomcat:type=ThreadPool,name="
+ ObjectName.quote("http-" + type + "-" + ADDRESS + "-" + port),
- "Tomcat:type=ThreadPool,name="
- + ObjectName.quote("http-" + type + "-" + ADDRESS + "-" + port) +
- ",subType=SocketProperties",
+ "Tomcat:type=SocketProperties,name="
+ + ObjectName.quote("http-" + type + "-" + ADDRESS + "-" + port),
};
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 11d9a12..279f78e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 9.0.35 (markt)" rtext="in development">
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ Move <code>SocketProperties</code> mbean to its own type rather than
+ use a subType to improve robustness with tools. (remm)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 9.0.34 (markt)" rtext="release in progress">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Filtering is no longer necessary now
SocketProperties is separate type
Posted by re...@apache.org.
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 <ma...@apache.org>
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<ObjectInstance> 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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org