[jbossweb-commits] JBossWeb SVN: r2316 - in branches: 7.4.x/src/main/java/org/apache/coyote/http11 and 1 other directory.

Author: remy.maucherat(a)jboss.com Date: 2013-12-02 04:57:49 -0500 (Mon, 02 Dec 2013) New Revision: 2316 Modified: branches/7.3.x/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java branches/7.3.x/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java branches/7.4.x/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java branches/7.4.x/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java Log: Fix apparently badly ported JMX code (java.io is correct, but not NIO 2 or native). Modified: branches/7.3.x/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java =================================================================== --- branches/7.3.x/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java 2013-11-29 16:40:39 UTC (rev 2315) +++ branches/7.3.x/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java 2013-12-02 09:57:49 UTC (rev 2316) @@ -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.3.x/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java =================================================================== --- branches/7.3.x/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java 2013-11-29 16:40:39 UTC (rev 2315) +++ branches/7.3.x/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java 2013-12-02 09:57:49 UTC (rev 2316) @@ -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); } } Modified: branches/7.4.x/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java 2013-11-29 16:40:39 UTC (rev 2315) +++ branches/7.4.x/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java 2013-12-02 09:57:49 UTC (rev 2316) @@ -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.4.x/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java 2013-11-29 16:40:39 UTC (rev 2315) +++ branches/7.4.x/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java 2013-12-02 09:57:49 UTC (rev 2316) @@ -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); } }