1 files changed, 3 insertions, 26 deletions
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXManagedObject.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXManagedObject.java
index a8fb864cf6..3561e16098 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXManagedObject.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXManagedObject.java
@@ -21,7 +21,6 @@
 package org.apache.qpid.management.ui.jmx;
 
 import java.util.HashMap;
-import java.util.Map;
 
 import javax.management.ObjectName;
 
@@ -32,36 +31,14 @@ public class JMXManagedObject extends ManagedBean
 {
     private ObjectName _objName;
     
+    @SuppressWarnings("unchecked")
     public JMXManagedObject(ObjectName objName)
     {
         super();
         this._objName = objName;
         setUniqueName(_objName.toString());
-        setDomain(_objName.getDomain());
-
-        HashMap<String,String> props = new HashMap<String,String>(_objName.getKeyPropertyList());
-
-        for(Map.Entry<String,String> entry : props.entrySet())
-        {
-            String value = entry.getValue();
-
-            if(value != null)
-            {
-                try
-                {
-                    //if the name is quoted in the ObjectName, unquote it
-                    value = ObjectName.unquote(value);
-                    entry.setValue(value);
-                }
-                catch(IllegalArgumentException e)
-                {
-                    //ignore, this just means the name is not quoted
-                    //and can be left unchanged
-                }
-            }
-        }
-
-        super.setProperties(props);
+        setDomain(_objName.getDomain());       
+        super.setProperties(new HashMap(_objName.getKeyPropertyList()));
     }
     
     public ObjectName getObjectName()