From 6d54493be7259eb7b56e6ea376fcb2959030d97d Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Mon, 15 Apr 2013 11:29:05 +0000 Subject: 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@1467940 13f79535-47bb-0310-9956-ffa450edef68 --- .../configuration/store/MemoryConfigurationEntryStore.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'qpid/java/broker') diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java index ebb009c09c..6ee26c0726 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java +++ b/qpid/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; } -- cgit v1.2.1