Author: kwall
Date: Sun Nov 27 20:57:46 2016
New Revision: 1771646
URL: http://svn.apache.org/viewvc?rev=1771646&view=rev
Log:
QPID-7533: Address review comments from <[email protected]>
Modified:
qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/amqp/AmqpManagementTest.java
Modified:
qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java?rev=1771646&r1=1771645&r2=1771646&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
(original)
+++
qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
Sun Nov 27 20:57:46 2016
@@ -627,20 +627,9 @@ class ManagementNode implements MessageS
InternalMessageHeader requestHeader = message.getMessageHeader();
final Map<String, Object> headers = requestHeader.getHeaderMap();
- ConfiguredObject<?> object = findObject(clazz, headers);
-
- boolean actuals = true;
- if(message.getMessageBody() instanceof Map)
- {
- @SuppressWarnings("unchecked")
- Map<String, Object> attributes = (Map<String, Object>)
message.getMessageBody();
- if (attributes.containsKey(ACTUALS_ATTRIBUTE))
- {
- Object actualsObject = attributes.get(ACTUALS_ATTRIBUTE);
- actuals = actualsObject instanceof Boolean ?
((Boolean)actualsObject) : Boolean.parseBoolean(String.valueOf(actualsObject));
- }
- }
+ final boolean actuals = headers.get(ACTUALS_ATTRIBUTE) == null ||
Boolean.parseBoolean(String.valueOf(headers.get(ACTUALS_ATTRIBUTE)));
+ ConfiguredObject<?> object = findObject(clazz, headers);
if(object != null)
{
final MutableMessageHeader responseHeader = new
MutableMessageHeader();
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/amqp/AmqpManagementTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/amqp/AmqpManagementTest.java?rev=1771646&r1=1771645&r2=1771646&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/amqp/AmqpManagementTest.java
(original)
+++
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/amqp/AmqpManagementTest.java
Sun Nov 27 20:57:46 2016
@@ -483,7 +483,7 @@ public class AmqpManagementTest extends
checkResponseIsMapType(responseMessage);
assertEquals("The name of the virtual host is not as expected",
"test", getValueFromMapResponse(responseMessage, "name"));
- message.setBoolean("actuals", false);
+ message.setBooleanProperty("actuals", false);
_producer.send(message);
responseMessage = _consumer.receive(getReceiveTimeout());
assertNotNull("A response message was not sent", responseMessage);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
