Author: bmaxwell Date: 2014-07-17 19:48:16 -0400 (Thu, 17 Jul 2014) New Revision: 2476 Modified: branches/JBOSSWEB_7_0_16_FINAL_BZ-1120889/java/org/apache/coyote/ajp/AjpAprProtocol.java branches/JBOSSWEB_7_0_16_FINAL_BZ-1120889/java/org/apache/coyote/http11/Http11AprProtocol.java Log: [BZ-1120889] backport fix for APR connector does not allow adding system property org.apache.tomcat.util.ENABLE_MODELER=true Modified: branches/JBOSSWEB_7_0_16_FINAL_BZ-1120889/java/org/apache/coyote/ajp/AjpAprProtocol.java =================================================================== --- branches/JBOSSWEB_7_0_16_FINAL_BZ-1120889/java/org/apache/coyote/ajp/AjpAprProtocol.java 2014-07-17 23:45:12 UTC (rev 2475) +++ branches/JBOSSWEB_7_0_16_FINAL_BZ-1120889/java/org/apache/coyote/ajp/AjpAprProtocol.java 2014-07-17 23:48:16 UTC (rev 2476) @@ -189,14 +189,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) { log.error("Can't register threadpool" ); } 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_0_16_FINAL_BZ-1120889/java/org/apache/coyote/http11/Http11AprProtocol.java =================================================================== --- branches/JBOSSWEB_7_0_16_FINAL_BZ-1120889/java/org/apache/coyote/http11/Http11AprProtocol.java 2014-07-17 23:45:12 UTC (rev 2475) +++ branches/JBOSSWEB_7_0_16_FINAL_BZ-1120889/java/org/apache/coyote/http11/Http11AprProtocol.java 2014-07-17 23:48:16 UTC (rev 2476) @@ -136,14 +136,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) { log.error("Can't register threadpool" ); } rgOname=new ObjectName - (domain + ":type=GlobalRequestProcessor,name=" + getName()); + (domain + ":type=GlobalRequestProcessor,name=" + getJmxName()); Registry.getRegistry(null, null).registerComponent ( cHandler.global, rgOname, null ); }