[jbossweb-commits] JBossWeb SVN: r2450 - in branches/JBOSSWEB_7_2_0_FINAL_BZ-1105394: src/main/java/org/apache/coyote/ajp and 1 other directories.

Author: aogburn Date: 2014-06-05 23:53:03 -0400 (Thu, 05 Jun 2014) New Revision: 2450 Modified: branches/JBOSSWEB_7_2_0_FINAL_BZ-1105394/ branches/JBOSSWEB_7_2_0_FINAL_BZ-1105394/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java branches/JBOSSWEB_7_2_0_FINAL_BZ-1105394/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java branches/JBOSSWEB_7_2_0_FINAL_BZ-1105394/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java Log: [BZ-1105394] merge fix Property changes on: branches/JBOSSWEB_7_2_0_FINAL_BZ-1105394 ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.2.x:2319 Modified: branches/JBOSSWEB_7_2_0_FINAL_BZ-1105394/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java =================================================================== --- branches/JBOSSWEB_7_2_0_FINAL_BZ-1105394/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java 2014-06-06 03:33:04 UTC (rev 2449) +++ branches/JBOSSWEB_7_2_0_FINAL_BZ-1105394/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java 2014-06-06 03:53:03 UTC (rev 2450) @@ -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/JBOSSWEB_7_2_0_FINAL_BZ-1105394/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java =================================================================== --- branches/JBOSSWEB_7_2_0_FINAL_BZ-1105394/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java 2014-06-06 03:33:04 UTC (rev 2449) +++ branches/JBOSSWEB_7_2_0_FINAL_BZ-1105394/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java 2014-06-06 03:53:03 UTC (rev 2450) @@ -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/JBOSSWEB_7_2_0_FINAL_BZ-1105394/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java =================================================================== --- branches/JBOSSWEB_7_2_0_FINAL_BZ-1105394/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java 2014-06-06 03:33:04 UTC (rev 2449) +++ branches/JBOSSWEB_7_2_0_FINAL_BZ-1105394/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java 2014-06-06 03:53:03 UTC (rev 2450) @@ -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); } }