QPID-4390, QPID-4743: generate ID's randomly at startup, for the broker and direct children in the configuration file

makes ID generation behaviour consistent with that for objects added via the management interface

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

1 files changed, 1 insertions, 8 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java
index ebb009c09c..6ee26c0726 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java
@@ -557,14 +557,7 @@ public class MemoryConfigurationEntryStore implements ConfigurationEntryStore
         UUID id = null;
         if (idAsString == null)
         {
-            if (expectedConfiguredObjectClass == Broker.class)
-            {
-                id = UUIDGenerator.generateRandomUUID();
-            }
-            else
-            {
-                id = UUIDGenerator.generateBrokerChildUUID(type, name);
-            }
+            id = UUIDGenerator.generateRandomUUID();
 
             _generatedObjectIdDuringLoad = true;
         }