diff options
author | Robert Godfrey <rgodfrey@apache.org> | 2015-03-11 14:12:18 +0000 |
---|---|---|
committer | Robert Godfrey <rgodfrey@apache.org> | 2015-03-11 14:12:18 +0000 |
commit | ab49373ecef7375209dcbf74b1882f23bda59d5f (patch) | |
tree | 408fa6593d5fe7f238d49ce0e887050b76803c0c | |
parent | c8444c39204eac278aab47840a16db3db7ee5e80 (diff) | |
download | qpid-python-ab49373ecef7375209dcbf74b1882f23bda59d5f.tar.gz |
QPID-6439 : Merge r1665702 to 0.32 branch
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1665878 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java | 5 |
1 files changed, 5 insertions, 0 deletions
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<String, Object> 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"); |