Author: orudyy
Date: Fri Mar 3 14:24:34 2017
New Revision: 1785311
URL: http://svn.apache.org/viewvc?rev=1785311&view=rev
Log:
QPID-7647: [Java Broker] Address review comments from Keith Wall
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java?rev=1785311&r1=1785310&r2=1785311&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
Fri Mar 3 14:24:34 2017
@@ -314,22 +314,19 @@ public class BrokerStoreUpgraderAndRecov
@Override
public void configuredObject(ConfiguredObjectRecord record)
{
- if (record.getType().equalsIgnoreCase("Broker"))
+ if (record.getType().equals("Broker"))
{
record = upgradeRootRecord(record);
Map<String, Object> brokerAttributes = new
HashMap<>(record.getAttributes());
_defaultVirtualHost =
(String)brokerAttributes.remove("defaultVirtualHost");
- boolean lowerCaseType =
"broker".equals(brokerAttributes.get("type"));
- if (lowerCaseType)
- {
- brokerAttributes.put("type", "Broker");
- }
- if (_defaultVirtualHost != null || lowerCaseType)
+ boolean typeDetected = brokerAttributes.remove("type") != null;
+
+ if (_defaultVirtualHost != null || typeDetected)
{
record = new ConfiguredObjectRecordImpl(record.getId(),
- "Broker",
+ record.getType(),
brokerAttributes,
record.getParents());
getUpdateMap().put(record.getId(), record);
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java?rev=1785311&r1=1785310&r2=1785311&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java
Fri Mar 3 14:24:34 2017
@@ -478,7 +478,7 @@ public class BrokerStoreUpgraderAndRecov
List<ConfiguredObjectRecord> brokerRecords =
findRecordByType("Broker", records);
assertEquals("Unexpected number of broker records", 1,
brokerRecords.size());
- assertEquals("Unexpected type", "Broker",
brokerRecords.get(0).getAttributes().get("type"));
+ assertFalse("Unexpected type",
brokerRecords.get(0).getAttributes().containsKey("type"));
}
public void testUpgradeAMQPPortWithNetworkBuffers()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
