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 | da684a3b32132ecfce4cd865f45ab50e0d48a7f7 (patch) | |
| tree | 33071c5dabb70f99c1d38af95ae7f4f946bd6cb2 /qpid/java | |
| parent | 8ad3d362d81ea08784930df2ba917a2532489929 (diff) | |
| download | qpid-python-da684a3b32132ecfce4cd865f45ab50e0d48a7f7.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@1560391 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java | 1 |
1 files changed, 1 insertions, 0 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 05b0052bf1..9b20c9a780 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 @@ -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) { |