diff options
| author | Robert Gemmell <robbie@apache.org> | 2014-01-22 15:55:32 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2014-01-22 15:55:32 +0000 |
| commit | 9581424ef032ebb874faf0ebb3db23fa1cf18ad8 (patch) | |
| tree | 6d68dc6c6a627348128032504860a32239661261 /java/broker-core/src | |
| parent | a4e52d3888879d601f9f4700d390d5852aa6d9ba (diff) | |
| download | qpid-python-9581424ef032ebb874faf0ebb3db23fa1cf18ad8.tar.gz | |
QPID-5065: re-instate incorrectly removed line in previous patch
Patch Supplied by Andrew MacBean <andymacbean@gmail.com>.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1560391 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker-core/src')
| -rw-r--r-- | java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java b/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java index 05b0052bf1..9b20c9a780 100644 --- a/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java +++ b/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java @@ -191,6 +191,7 @@ public class JsonFileConfigStore implements DurableConfigurationStore Map data = _objectMapper.readValue(new File(_directoryName,_configFileName),Map.class); Collection<Class<? extends ConfiguredObject>> childClasses = MODEL.getChildTypes(VirtualHost.class); + data.remove("modelVersion"); Object configVersion; if((configVersion = data.remove("configVersion")) instanceof Integer) { |