diff options
| author | Robert Gemmell <robbie@apache.org> | 2013-04-15 11:29:05 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2013-04-15 11:29:05 +0000 |
| commit | 6d54493be7259eb7b56e6ea376fcb2959030d97d (patch) | |
| tree | 839a8bf6750d8d87a28ac86a589b30ddde0b7bdc /qpid/java/broker | |
| parent | 16b1e210141d34ad4ce7b36c723b5ecbce7ea474 (diff) | |
| download | qpid-python-6d54493be7259eb7b56e6ea376fcb2959030d97d.tar.gz | |
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
Diffstat (limited to 'qpid/java/broker')
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStore.java | 9 |
1 files changed, 1 insertions, 8 deletions
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; } |