From da684a3b32132ecfce4cd865f45ab50e0d48a7f7 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Wed, 22 Jan 2014 15:55:32 +0000 Subject: QPID-5065: re-instate incorrectly removed line in previous patch Patch Supplied by Andrew MacBean . git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1560391 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java | 1 + 1 file changed, 1 insertion(+) (limited to 'qpid/java') 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> childClasses = MODEL.getChildTypes(VirtualHost.class); + data.remove("modelVersion"); Object configVersion; if((configVersion = data.remove("configVersion")) instanceof Integer) { -- cgit v1.2.1