QPID-6027 : Sort children in the Json store by name

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

1 files changed, 6 insertions, 1 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 4671539b66..5b07f9413e 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
@@ -445,9 +445,14 @@ public class JsonFileConfigStore implements DurableConfigurationStore
                         String parentId = parent.toString();
                         if(id.toString().equals(parentId))
                         {
-                            entities.add(build(childClass,childId));
+                            sortedChildren.add(childRecord);
                         }
                     }
+                    for(ConfiguredObjectRecord childRecord : sortedChildren)
+                    {
+                        entities.add(build(childClass, childRecord.getId()));
+                    }
+
                     if(!entities.isEmpty())
                     {
                         map.put(attrName,entities);