Attachment 831859 Details for Bug 1036977 – porting missing fix for APR and NIO connector

[patch] porting missing fix for APR and NIO connector

BZ1036977.patch (text/plain), 3.35 KB, created by Masafumi Miura on 2013-12-03 02:57:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Masafumi Miura

Created: 2013-12-03 02:57:57 UTC

Size: 3.35 KB

patch

obsolete

>Index: src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java
>===================================================================
>--- src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java	(revision 2317)
>+++ src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java	(working copy)
>@@ -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);
>             }
>         }
>Index: src/main/java/org/apache/coyote/http11/Http11AprProtocol.java
>===================================================================
>--- src/main/java/org/apache/coyote/http11/Http11AprProtocol.java	(revision 2317)
>+++ src/main/java/org/apache/coyote/http11/Http11AprProtocol.java	(working copy)
>@@ -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 );
>             }
>Index: src/main/java/org/apache/coyote/http11/Http11NioProtocol.java
>===================================================================
>--- src/main/java/org/apache/coyote/http11/Http11NioProtocol.java	(revision 2317)
>+++ src/main/java/org/apache/coyote/http11/Http11NioProtocol.java	(working copy)
>@@ -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);
> 			}
> 		}

Actions: View | Diff

Attachments on bug 1036977: 831859