This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push: new 8d98946e78 Fix JMX value for keepAliveCount 8d98946e78 is described below commit 8d98946e78adc7417caac4ae583033435652235a Author: remm <r...@apache.org> AuthorDate: Thu Jun 19 12:32:39 2025 +0200 Fix JMX value for keepAliveCount keepAliveCount should mostly reflect the amount of keys in the selector, rather than something more complicated. Add useVirtualThreads flag value to JMX. --- java/org/apache/tomcat/util/net/NioEndpoint.java | 2 +- java/org/apache/tomcat/util/net/mbeans-descriptors.xml | 3 +++ webapps/docs/changelog.xml | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java index cb067a1e88..c0bf7fd974 100644 --- a/java/org/apache/tomcat/util/net/NioEndpoint.java +++ b/java/org/apache/tomcat/util/net/NioEndpoint.java @@ -629,7 +629,7 @@ public class NioEndpoint extends AbstractJsseEndpoint<NioChannel,SocketChannel> } public int getKeyCount() { - return keyCount; + return selector.keys().size(); } public Selector getSelector() { diff --git a/java/org/apache/tomcat/util/net/mbeans-descriptors.xml b/java/org/apache/tomcat/util/net/mbeans-descriptors.xml index d5e52527db..2ff1cda6b5 100644 --- a/java/org/apache/tomcat/util/net/mbeans-descriptors.xml +++ b/java/org/apache/tomcat/util/net/mbeans-descriptors.xml @@ -151,6 +151,9 @@ <attribute name="useSendfile" type="boolean"/> + <attribute name="useVirtualThreads" + type="boolean"/> + <operation name="addNegotiatedProtocol" returnType="void"> <parameter name="param0" diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index ad137a94da..b838ff4003 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -129,6 +129,10 @@ request multiple times. Based on pull request <pr>868</pr> by qingdaoheze. (markt) </fix> + <fix> + Fix JMX value for <code>keepAliveCount</code> on the endpoint. Also add + the value of <code>useVirtualThreads</code> in JMX. (remm) + </fix> </changelog> </subsection> <subsection name="Jasper"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org