Author: rgodfrey
Date: Tue Mar 10 21:20:25 2015
New Revision: 1665702
URL: http://svn.apache.org/r1665702
Log:
QPID-6439 : [Java Broker] config upgrader should upgrade key/trust stores using
the (omitted) default type
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java?rev=1665702&r1=1665701&r2=1665702&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
Tue Mar 10 21:20:25 2015
@@ -260,6 +260,11 @@ public class BrokerStoreUpgraderAndRecov
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");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
