[infinispan-commits] Infinispan SVN: r2458 - trunk/core/src/main/java/org/infinispan/jmx and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: pferraro
Date: 2010-09-30 10:08:13 -0400 (Thu, 30 Sep 2010)
New Revision: 2458

Modified:
   branches/4.2.x/core/src/main/java/org/infinispan/jmx/ComponentsJmxRegistration.java
   trunk/core/src/main/java/org/infinispan/jmx/ComponentsJmxRegistration.java
Log:
[ISPN-677] MalformedObjectNameException during jmx registration if cache name contains unexpected characters

Modified: branches/4.2.x/core/src/main/java/org/infinispan/jmx/ComponentsJmxRegistration.java
===================================================================
--- branches/4.2.x/core/src/main/java/org/infinispan/jmx/ComponentsJmxRegistration.java	2010-09-30 09:34:41 UTC (rev 2457)
+++ branches/4.2.x/core/src/main/java/org/infinispan/jmx/ComponentsJmxRegistration.java	2010-09-30 14:08:13 UTC (rev 2458)
@@ -67,8 +67,8 @@
    public ComponentsJmxRegistration(MBeanServer mBeanServer, Set<AbstractComponentRegistry.Component> components, String groupName) {
       this.mBeanServer = mBeanServer;
       this.components = components;
-      // Replace any malforming characters out of the group name
-      this.groupName = groupName.replace(':', '_').replace('=','_');
+      // Quote group name, to handle invalid ObjectName characters
+      this.groupName = ObjectName.quote(groupName);
    }
 
    public void setJmxDomain(String jmxDomain) {

Modified: trunk/core/src/main/java/org/infinispan/jmx/ComponentsJmxRegistration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/jmx/ComponentsJmxRegistration.java	2010-09-30 09:34:41 UTC (rev 2457)
+++ trunk/core/src/main/java/org/infinispan/jmx/ComponentsJmxRegistration.java	2010-09-30 14:08:13 UTC (rev 2458)
@@ -67,8 +67,8 @@
    public ComponentsJmxRegistration(MBeanServer mBeanServer, Set<AbstractComponentRegistry.Component> components, String groupName) {
       this.mBeanServer = mBeanServer;
       this.components = components;
-      // Replace any malforming characters out of the group name
-      this.groupName = groupName.replace(':', '_').replace('=','_');
+      // Quote group name, to handle invalid ObjectName characters
+      this.groupName = ObjectName.quote(groupName);
    }
 
    public void setJmxDomain(String jmxDomain) {