fix for upgrader to ensure correctly updated attributes are returned

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-vhost-refactor@1494547 13f79535-47bb-0310-9956-ffa450edef68

java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java

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 d6b7dec..ae7e699 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 @@
             {
                 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);
     }