Author: rgodfrey
Date: Wed Mar 11 14:12:18 2015
New Revision: 1665878
URL: http://svn.apache.org/r1665878
Log:
QPID-6439 : Merge r1665702 to 0.32 branch
Modified:
qpid/branches/0.32/qpid/ (props changed)
qpid/branches/0.32/qpid/java/ (props changed)
qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
Propchange: qpid/branches/0.32/qpid/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 11 14:12:18 2015
@@ -6,4 +6,4 @@
/qpid/branches/mcpierce-QPID-4719/qpid:1477004-1477093
/qpid/branches/qpid-2935/qpid:1061302-1072333
/qpid/branches/qpid-3346/qpid:1144319-1179855
-/qpid/trunk/qpid:1661079,1661142,1661162,1661165-1661166,1661207,1661212,1661364,1661368,1661373,1661530-1661531,1661693,1661741,1661929,1662051,1662473,1662489,1662683,1664160,1664334,1664714,1664731,1664839
+/qpid/trunk/qpid:1661079,1661142,1661162,1661165-1661166,1661207,1661212,1661364,1661368,1661373,1661530-1661531,1661693,1661741,1661929,1662051,1662473,1662489,1662683,1664160,1664334,1664714,1664731,1664839,1665702
Propchange: qpid/branches/0.32/qpid/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 11 14:12:18 2015
@@ -9,4 +9,4 @@
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
/qpid/trunk/qpid:796646-796653
-/qpid/trunk/qpid/java:1661079,1661142,1661162,1661165-1661166,1661207,1661212,1661364,1661368,1661373,1661530-1661531,1661693,1661741,1661929,1662051,1662473,1662489,1662683,1664114,1664160,1664309,1664334,1664714,1664731,1664839
+/qpid/trunk/qpid/java:1661079,1661142,1661162,1661165-1661166,1661207,1661212,1661364,1661368,1661373,1661530-1661531,1661693,1661741,1661929,1662051,1662473,1662489,1662683,1664114,1664160,1664309,1664334,1664714,1664731,1664839,1665702
Modified:
qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java?rev=1665878&r1=1665877&r2=1665878&view=diff
==============================================================================
---
qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
(original)
+++
qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
Wed Mar 11 14:12:18 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]
