diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-02-23 18:38:07 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-02-23 18:38:07 +0000 |
| commit | 1042f6293585df659128da60a0da9ebb2931340d (patch) | |
| tree | 83325fc6410c010792cdb09e12d05504653281f0 /java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java | |
| parent | ed3e3fbf6bfe2d3341254cdba8a2a3300f0ab511 (diff) | |
| download | qpid-python-1042f6293585df659128da60a0da9ebb2931340d.tar.gz | |
QPID-5579 : [Java Broker] build attribute meta data the same way for REST API and AMQP Management
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1571054 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java')
| -rw-r--r-- | java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java | 4 |
1 files changed, 2 insertions, 2 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 03dd7c66a8..0d5d868af2 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 @@ -37,7 +37,7 @@ public class ConfiguredObjectToMapConverter private Model _model = Model.getInstance(); - public Map<String, Object> convertObjectToMap(final ConfiguredObject confObject, + public Map<String, Object> convertObjectToMap(final ConfiguredObject<?> confObject, Class<? extends ConfiguredObject> clazz, int depth) { @@ -62,7 +62,7 @@ public class ConfiguredObjectToMapConverter } private void incorporateAttributesIntoMap( - final ConfiguredObject confObject, Map<String, Object> object) + final ConfiguredObject<?> confObject, Map<String, Object> object) { for(String name : confObject.getAttributeNames()) { |