diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-08-21 08:57:39 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-08-21 08:57:39 +0000 |
| commit | cd030a240f41fc55994659a8724cfbd225dfdf7d (patch) | |
| tree | ef73e50b5ee6bec897298a9a48a32a47f982f666 /qpid/java/broker-core/src | |
| parent | 4a7e7edfc569a4f28cd0abe86746b6441ed20ed2 (diff) | |
| download | qpid-python-cd030a240f41fc55994659a8724cfbd225dfdf7d.tar.gz | |
QPID-6027 : Sort children in the Json store by name
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619317 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-core/src')
| -rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java index 5b07f9413e..70dc2344db 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java @@ -432,9 +432,13 @@ public class JsonFileConfigStore implements DurableConfigurationStore SortedSet<ConfiguredObjectRecord> sortedChildren = new TreeSet<>(new Comparator<ConfiguredObjectRecord>() { @Override - public int compare(final ConfiguredObjectRecord o1, final ConfiguredObjectRecord o2) + public int compare(final ConfiguredObjectRecord left, final ConfiguredObjectRecord right) { - return ((String)o1.getAttributes().get(ConfiguredObject.NAME)).compareTo(((String)o2.getAttributes().get(ConfiguredObject.NAME))); + String leftName = (String) left.getAttributes().get(ConfiguredObject.NAME); + String rightName = (String) right.getAttributes().get(ConfiguredObject.NAME); + return leftName == null + ? -1 + : rightName == null ? 1 : leftName.compareTo(rightName); } }); for(UUID childId : childIds) |