cluster names should be quoted (https://issues.jboss.org/browse/JGRP-…

…1327)
belaban · May 25, 2011 · c3fe65f · c3fe65f
1 parent f9e6bed
commit c3fe65f
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/org/jgroups/jmx/JmxConfigurator.java b/src/org/jgroups/jmx/JmxConfigurator.java
@@ -43,6 +43,8 @@ public static void registerChannel(JChannel channel, MBeanServer server, String
         if (cluster_name == null)
             cluster_name = "null";
 
+        cluster_name=ObjectName.quote(cluster_name);
+
         if (register_protocols) {
             ProtocolStack stack = channel.getProtocolStack();
             List<Protocol> protocols = stack.getProtocols();
@@ -90,6 +92,9 @@ public static void unregisterChannel(JChannel c, MBeanServer server, String clus
     public static void unregisterChannel(JChannel c, MBeanServer server, String domain, String clusterName)
                     throws Exception {
 
+        if(clusterName != null)
+            clusterName=ObjectName.quote(clusterName);
+
         ProtocolStack stack = c.getProtocolStack();
         List<Protocol> protocols = stack.getProtocols();
         for (Protocol p : protocols) {
@@ -197,19 +202,18 @@ private static void internalUnregister(Object obj, MBeanServer server, String na
         }
     }
 
-    private static ObjectName getObjectName(Object obj, String name)
-                    throws MalformedObjectNameException {
+    private static ObjectName getObjectName(Object obj, String name) throws MalformedObjectNameException {
         MBean resource = obj.getClass().getAnnotation(MBean.class);
         if (name != null && name.length() > 0) {
             return new ObjectName(name);
         } else if (resource.objectName() != null && resource.objectName().length() > 0) {
             return new ObjectName(resource.objectName());
         } else {
-            throw new MalformedObjectNameException("Instance " + obj + " of a class "
-                            + obj.getClass() + " does not have a valid object name");
+            throw new MalformedObjectNameException(obj + " of class " + obj.getClass() + " has an invalid object name");
         }
     }
 
+
     /**
      * Unregisters object_name and everything under it
      *