You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2013/06/19 13:02:02 UTC
svn commit: r1494547 -
/qpid/branches/java-broker-vhost-refactor/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java
Author: rgodfrey
Date: Wed Jun 19 11:02:02 2013
New Revision: 1494547
URL: http://svn.apache.org/r1494547
Log:
fix for upgrader to ensure correctly updated attributes are returned
Modified:
qpid/branches/java-broker-vhost-refactor/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java
Modified: qpid/branches/java-broker-vhost-refactor/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-vhost-refactor/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java?rev=1494547&r1=1494546&r2=1494547&view=diff
==============================================================================
--- qpid/branches/java-broker-vhost-refactor/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java (original)
+++ qpid/branches/java-broker-vhost-refactor/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java Wed Jun 19 11:02:02 2013
@@ -166,13 +166,13 @@ public class BrokerRecoverer implements
{
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);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org