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/store/JsonFileConfigStore.java | |
parent | 0a64e2b857dc189a621d51dffedf573746bd08e5 (diff) | |
download | qpid-python-676b0069419e84024417ea72f46487ae003dfd4c.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/store/JsonFileConfigStore.java')
-rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java index 819da86ca0..a5ace16cfa 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java @@ -31,6 +31,7 @@ import java.util.*; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.Model; import org.apache.qpid.server.model.VirtualHost; +import org.apache.qpid.server.store.handler.ConfiguredObjectRecordHandler; import org.codehaus.jackson.JsonGenerator; import org.codehaus.jackson.JsonParseException; import org.codehaus.jackson.JsonProcessingException; @@ -97,22 +98,27 @@ public class JsonFileConfigStore implements DurableConfigurationStore } @Override - public void recoverConfigurationStore(ConfigurationRecoveryHandler recoveryHandler) + public void visitConfiguredObjectRecords(ConfiguredObjectRecordHandler handler) { - recoveryHandler.beginConfigurationRecovery(this,_configVersion); + handler.begin(_configVersion); List<ConfiguredObjectRecord> records = new ArrayList<ConfiguredObjectRecord>(_objectsById.values()); for(ConfiguredObjectRecord record : records) { - recoveryHandler.configuredObject(record); + boolean shouldContinue = handler.handle(record); + if (!shouldContinue) + { + break; + } } int oldConfigVersion = _configVersion; - _configVersion = recoveryHandler.completeConfigurationRecovery(); + _configVersion = handler.end(); if(oldConfigVersion != _configVersion) { save(); } } + private void setup(final Map<String, Object> configurationStoreSettings) { Object storePathAttr = configurationStoreSettings.get(DurableConfigurationStore.STORE_PATH); |