From 34ff17e386900442c79c2c266a417e3ba868470e Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Tue, 10 Mar 2015 21:20:25 +0000 Subject: QPID-6439 : [Java Broker] config upgrader should upgrade key/trust stores using the (omitted) default type git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1665702 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'qpid/java') diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java index 69d94a6710..70b8c6296b 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java @@ -260,6 +260,11 @@ public class BrokerStoreUpgraderAndRecoverer private ConfiguredObjectRecord upgradeKeyStoreRecordIfTypeTheSame(ConfiguredObjectRecord record, String expectedType) { Map attributes = new HashMap<>(record.getAttributes()); + // Type may not be present, in which case the default type - which is the type affected - will be being used + if(!attributes.containsKey("type")) + { + attributes.put("type", expectedType); + } if (expectedType.equals(attributes.get("type"))) { Object path = attributes.remove("path"); -- cgit v1.2.1