diff options
author | Robert Godfrey <rgodfrey@apache.org> | 2013-06-19 11:02:02 +0000 |
---|---|---|
committer | Robert Godfrey <rgodfrey@apache.org> | 2013-06-19 11:02:02 +0000 |
commit | 800f0ab2af9c92e9f9d5e4e39c4738c9f694b171 (patch) | |
tree | 95c1b99820f10036c5d9e3c7f3686d0b15e4df8a | |
parent | 118c5c885463451ba8032fa109225c18a08efa45 (diff) | |
download | qpid-python-java-broker-vhost-refactor.tar.gz |
fix for upgrader to ensure correctly updated attributes are returnedjava-broker-vhost-refactor
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-vhost-refactor@1494547 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java index d6b7dec1aa..ae7e699264 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java +++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java @@ -166,13 +166,13 @@ public class BrokerRecoverer implements ConfiguredObjectRecoverer<Broker> { oldVersion = modelVersion; StoreUpgrader.upgrade(entry.getStore()); + entry = entry.getStore().getRootEntry(); + attributes = entry.getAttributes(); modelVersion = MapValueConverter.getStringAttribute(Broker.MODEL_VERSION, attributes, null); } while(!(modelVersion.equals(oldVersion) || modelVersion.equals(Model.MODEL_VERSION))); } - attributes.put(Broker.MODEL_VERSION, Model.MODEL_VERSION); - return new HashMap<String, Object>(attributes); } |