[jbossweb-commits] JBossWeb SVN: r2318 - in branches: 7.4.x/src/main/java/org/apache/coyote/ajp and 1 other directory.
Author: remy.maucherat(a)jboss.com
Date: 2013-12-03 04:14:08 -0500 (Tue, 03 Dec 2013)
New Revision: 2318
Modified:
branches/7.3.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java
branches/7.4.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java
Log:
Fix apparently badly ported JMX code (java.io is correct, but not NIO 2 or native). Missed
AJP.
Modified: branches/7.3.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java
===================================================================
--- branches/7.3.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java 2013-12-02
12:06:55 UTC (rev 2317)
+++ branches/7.3.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java 2013-12-03
09:14:08 UTC (rev 2318)
@@ -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.4.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java
===================================================================
--- branches/7.4.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java 2013-12-02
12:06:55 UTC (rev 2317)
+++ branches/7.4.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java 2013-12-03
09:14:08 UTC (rev 2318)
@@ -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);
}
}