Author: markt
Date: Mon Oct 4 21:09:11 2010
New Revision: 1004430
URL: http://svn.apache.org/viewvc?rev=1004430&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49856
Add executor name to connector in JMX
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1004430&r1=1004429&r2=1004430&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 4 21:09:11 2010
@@ -209,12 +209,6 @@ PATCHES PROPOSED TO BACKPORT:
1) There are some elements where namespace prefix was not added
2) Our XMLWriter class has support for namespaces. I'd be better to use
that.
-* Fix http://people.apache.org/~markt/patches/2010-09-30-bug49856-tc6.patch
- Add executor name to connector in JMX
- http://people.apache.org/~markt/patches/2010-09-30-bug49856-tc6.patch
- +1: markt, kkolinko, kfujino
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49860
Add support for trailing headers.
http://svn.apache.org/viewvc?rev=1003461&view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java?rev=1004430&r1=1004429&r2=1004430&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java Mon
Oct 4 21:09:11 2010
@@ -886,6 +886,15 @@ public class Connector
return useIPVHosts;
}
+
+ public String getExecutorName() {
+ Object ex = IntrospectionUtils.getProperty(protocolHandler,
"executor");
+ if (ex instanceof org.apache.catalina.Executor) {
+ return ((org.apache.catalina.Executor) ex).getName();
+ }
+ return "Internal";
+ }
+
// --------------------------------------------------------- Public Methods
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml?rev=1004430&r1=1004429&r2=1004430&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
Mon Oct 4 21:09:11 2010
@@ -85,6 +85,11 @@
description="The 'enable DNS lookups' flag for this Connector"
type="boolean"/>
+ <attribute name="executorName"
+ description="The name of the executor - if any - associated with
this Connector"
+ type="java.lang.String"
+ writeable="false"/>
+
<attribute name="keepAliveTimeout"
description="The number of seconds Tomcat will wait for a subsequent
request before closing the connection"
type="int"/>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1004430&r1=1004429&r2=1004430&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Oct 4 21:09:11 2010
@@ -103,6 +103,10 @@
<add>
Provide better web application state information via JMX. (markt)
</add>
+ <add>
+ <bug>49856</bug>: Expose the executor name for the connector via JMX.
+ (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
