[jbossweb-commits] JBossWeb SVN: r2319 - in branches/7.2.x/src/main/java/org/apache/coyote: http11 and 1 other directory.
Author: remy.maucherat(a)jboss.com
Date: 2013-12-03 04:17:47 -0500 (Tue, 03 Dec 2013)
New Revision: 2319
Modified:
branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java
branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java
branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java
Log:
BZ1036977: Fix using modeler (bad mbean names) with native and NIO2 connectors.
Modified: branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java
===================================================================
--- branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java 2013-12-03
09:14:08 UTC (rev 2318)
+++ branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java 2013-12-03
09:17:47 UTC (rev 2319)
@@ -166,14 +166,14 @@
if (this.domain != null ) {
try {
tpOname = new ObjectName
- (domain + ":" + "type=ThreadPool,name=" +
getName());
+ (domain + ":" + "type=ThreadPool,name=" +
getJmxName());
Registry.getRegistry(null, null)
.registerComponent(endpoint, tpOname, null );
} catch (Exception e) {
CoyoteLogger.AJP_LOGGER.errorRegisteringPool(e);
}
rgOname = new ObjectName
- (domain + ":type=GlobalRequestProcessor,name=" +
getName());
+ (domain + ":type=GlobalRequestProcessor,name=" +
getJmxName());
Registry.getRegistry(null, null).registerComponent(cHandler.global,
rgOname, null);
}
}
Modified: branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java
===================================================================
---
branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java 2013-12-03
09:14:08 UTC (rev 2318)
+++
branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java 2013-12-03
09:17:47 UTC (rev 2319)
@@ -118,14 +118,14 @@
if( this.domain != null ) {
try {
tpOname=new ObjectName
- (domain + ":" + "type=ThreadPool,name=" +
getName());
+ (domain + ":" + "type=ThreadPool,name=" +
getJmxName());
Registry.getRegistry(null, null)
.registerComponent(endpoint, tpOname, null );
} catch (Exception e) {
CoyoteLogger.HTTP_LOGGER.errorRegisteringPool(e);
}
rgOname=new ObjectName
- (domain + ":type=GlobalRequestProcessor,name=" +
getName());
+ (domain + ":type=GlobalRequestProcessor,name=" +
getJmxName());
Registry.getRegistry(null, null).registerComponent
( cHandler.global, rgOname, null );
}
Modified: branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java
===================================================================
---
branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java 2013-12-03
09:14:08 UTC (rev 2318)
+++
branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java 2013-12-03
09:17:47 UTC (rev 2319)
@@ -129,12 +129,12 @@
if (org.apache.tomcat.util.Constants.ENABLE_MODELER) {
if (this.domain != null) {
try {
- tpOname = new ObjectName(domain + ":" + "type=ThreadPool,name="
+ getName());
+ tpOname = new ObjectName(domain + ":" + "type=ThreadPool,name="
+ getJmxName());
Registry.getRegistry(null, null).registerComponent(endpoint, tpOname, null);
} catch (Exception e) {
CoyoteLogger.HTTP_LOGGER.errorRegisteringPool(e);
}
- rgOname = new ObjectName(domain + ":type=GlobalRequestProcessor,name=" +
getName());
+ rgOname = new ObjectName(domain + ":type=GlobalRequestProcessor,name=" +
getJmxName());
Registry.getRegistry(null, null).registerComponent(cHandler.global, rgOname, null);
}
}