[jboss-cvs] JBoss Messaging SVN: r4942 - in trunk/src/main/org/jboss/messaging: jms/server/management/impl and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: jmesnil
Date: 2008-09-15 10:36:38 -0400 (Mon, 15 Sep 2008)
New Revision: 4942

Modified:
   trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java
   trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSManagementServiceImpl.java
Log:
JBMESSAGING-1420: used ObjectName.quote(String) to quote any user input used by the ObjectNames

Modified: trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java	2008-09-15 12:15:45 UTC (rev 4941)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java	2008-09-15 14:36:38 UTC (rev 4942)
@@ -22,6 +22,8 @@
 
 package org.jboss.messaging.core.management.impl;
 
+import static javax.management.ObjectName.quote;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -91,15 +93,15 @@
          throws Exception
    {
       return ObjectName.getInstance(String.format(
-            "%s:module=Core,type=Address,name=%s", DOMAIN, address));
+            "%s:module=Core,type=Address,name=%s", DOMAIN, quote(address.toString())));
    }
 
    public static ObjectName getQueueObjectName(final SimpleString address,
          final SimpleString name) throws Exception
    {
       return ObjectName.getInstance(String.format(
-            "%s:module=Core,type=Queue,address=%s,name=%s", DOMAIN, address,
-            name));
+            "%s:module=Core,type=Queue,address=%s,name=%s", DOMAIN, quote(address.toString()),
+            quote(name.toString())));
    }
 
    // Constructors --------------------------------------------------

Modified: trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSManagementServiceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSManagementServiceImpl.java	2008-09-15 12:15:45 UTC (rev 4941)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSManagementServiceImpl.java	2008-09-15 14:36:38 UTC (rev 4942)
@@ -22,6 +22,8 @@
 
 package org.jboss.messaging.jms.server.management.impl;
 
+import static javax.management.ObjectName.quote;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -73,21 +75,21 @@
          throws Exception
    {
       return ObjectName.getInstance(ManagementServiceImpl.DOMAIN
-            + ":module=JMS,type=Queue,name=" + name.toString());
+            + ":module=JMS,type=Queue,name=" + quote(name.toString()));
    }
 
    public static ObjectName getJMSTopicObjectName(final String name)
          throws Exception
    {
       return ObjectName.getInstance(ManagementServiceImpl.DOMAIN
-            + ":module=JMS,type=Topic,name=" + name.toString());
+            + ":module=JMS,type=Topic,name=" + quote(name.toString()));
    }
 
    public static ObjectName getConnectionFactoryObjectName(final String name)
          throws Exception
    {
       return ObjectName.getInstance(ManagementServiceImpl.DOMAIN
-            + ":module=JMS,type=ConnectionFactory,name=" + name);
+            + ":module=JMS,type=ConnectionFactory,name=" + quote(name));
    }
 
    // Constructors --------------------------------------------------