diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-08-21 09:34:40 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-08-21 09:34:40 +0000 |
| commit | e21553135bfa7a5dc34fdd523564e6418b7a13ea (patch) | |
| tree | 8b9b1529926c2c99451e0b8fe0b5d27ee2244add | |
| parent | c051db3ee8383ab223bf72440d0359cc4805e09f (diff) | |
| download | qpid-python-e21553135bfa7a5dc34fdd523564e6418b7a13ea.tar.gz | |
QPID-6027 : [Java Broker] Sort statistics
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619323 13f79535-47bb-0310-9956-ffa450edef68
2 files changed, 4 insertions, 2 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java index b7b5197753..e377d31baf 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java @@ -56,6 +56,7 @@ public class ConfiguredObjectTypeRegistry ConfiguredObject.DESCRIPTION, ConfiguredObject.TYPE, ConfiguredObject.DESIRED_STATE, + ConfiguredObject.STATE, ConfiguredObject.DURABLE, ConfiguredObject.LIFETIME_POLICY, ConfiguredObject.CONTEXT)) diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java index a444f9e2e4..c8bce09485 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java @@ -31,6 +31,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.TreeMap; import org.apache.qpid.server.model.ConfiguredObject; @@ -152,10 +153,10 @@ public class ConfiguredObjectToMapConverter } private void incorporateStatisticsIntoMap( - final ConfiguredObject confObject, Map<String, Object> object) + final ConfiguredObject<?> confObject, Map<String, Object> object) { - Map<String, Object> statMap = confObject.getStatistics(); + Map<String, Object> statMap = new TreeMap<String,Object>(confObject.getStatistics()); if(!statMap.isEmpty()) { |