diff options
author | Robert Godfrey <rgodfrey@apache.org> | 2014-04-04 22:10:24 +0000 |
---|---|---|
committer | Robert Godfrey <rgodfrey@apache.org> | 2014-04-04 22:10:24 +0000 |
commit | 676b0069419e84024417ea72f46487ae003dfd4c (patch) | |
tree | 563df3e3637b1868857d4e30e6ac7e356c8ad344 /qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java | |
parent | 0a64e2b857dc189a621d51dffedf573746bd08e5 (diff) | |
download | qpid-python-java-broker-config-store-changes.tar.gz |
Merge from trunkjava-broker-config-store-changes
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-config-store-changes@1584926 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java')
-rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java index e3fd938225..14849aea1e 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java @@ -29,11 +29,11 @@ import org.apache.qpid.server.logging.subjects.MessageStoreLogSubject; import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.plugin.MessageStoreFactory; import org.apache.qpid.server.stats.StatisticsGatherer; - -import org.apache.qpid.server.store.DurableConfigurationRecoverer; +import org.apache.qpid.server.store.ConfiguredObjectRecordRecoveverAndUpgrader; import org.apache.qpid.server.store.DurableConfigurationStore; import org.apache.qpid.server.store.DurableConfigurationStoreCreator; import org.apache.qpid.server.store.MessageStore; +import org.apache.qpid.server.store.handler.ConfiguredObjectRecordHandler; public class StandardVirtualHost extends AbstractVirtualHost { @@ -107,18 +107,22 @@ public class StandardVirtualHost extends AbstractVirtualHost if (_configurationStoreLogSubject != null) { getEventLogger().message(_configurationStoreLogSubject, ConfigStoreMessages.STORE_LOCATION(configurationStoreSettings.toString())); + getEventLogger().message(_configurationStoreLogSubject, ConfigStoreMessages.RECOVERY_START()); } - DurableConfigurationRecoverer configRecoverer = new DurableConfigurationRecoverer(getName(), getDurableConfigurationRecoverers(), - new DefaultUpgraderProvider(this), getEventLogger()); + ConfiguredObjectRecordHandler upgraderRecoverer = new ConfiguredObjectRecordRecoveverAndUpgrader(this, getDurableConfigurationRecoverers()); + + _durableConfigurationStore.visitConfiguredObjectRecords(upgraderRecoverer); - _durableConfigurationStore.recoverConfigurationStore(configRecoverer); + if (_configurationStoreLogSubject != null) + { + getEventLogger().message(_configurationStoreLogSubject, ConfigStoreMessages.RECOVERY_COMPLETE()); + } // If store does not have entries for standard exchanges (amq.*), the following will create them. initialiseModel(); - VirtualHostConfigRecoveryHandler recoveryHandler = new VirtualHostConfigRecoveryHandler(this, getMessageStoreLogSubject()); - _messageStore.recoverMessageStore(recoveryHandler, recoveryHandler); + new MessageStoreRecoverer(this, getMessageStoreLogSubject()).recover(); attainActivation(); } |