[tomcat] 01/02: Use a separate mbean type for SocketProperties
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 edbb6bf704246cd64a2a0af6b023b95664bfe30c
Author: remm
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 81c0ad8..2b47dee 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -1124,7 +1124,7 @@ public abstract class AbstractEndpoint {
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 5fb89f8..badd59b 100644
--- a/test/org/apache/catalina/mbeans/TestRegistration.java
+++ b/test/org/apache/catalina/mbeans/TestRegistration.java
@@ -134,9 +134,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 7ad9daf..f2f2d87 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -55,6 +55,14 @@
+
+
+
+Move SocketProperties mbean to its own type rather than
+use a subType to improve robustness with tools. (remm)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Use a separate mbean type for SocketProperties
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
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 {
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).
-->
+
+
+
+Move SocketProperties mbean to its own type rather than
+use a subType to improve robustness with tools. (remm)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
