QPID-5672 : [Java Broker] move variable interpolation to the configured object

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1585979 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 16 insertions, 0 deletions

diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java b/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java
index 2cf7f3f80c..b4e386a685 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java
+++ b/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java
@@ -69,6 +69,22 @@ public class ConfiguredObjectToMapConverter
             {
                 object.put(name, ((ConfiguredObject) value).getName());
             }
+            else if(value instanceof Collection)
+            {
+                List<Object> converted = new ArrayList();
+                for(Object member : (Collection)value)
+                {
+                    if(member instanceof ConfiguredObject)
+                    {
+                        converted.add(((ConfiguredObject)member).getName());
+                    }
+                    else
+                    {
+                        converted.add(member);
+                    }
+                }
+                object.put(name, converted);
+            }
             else if(value != null)
             {
                 object.put(name, value);