gemmellr commented on a change in pull request #3796:
URL: https://github.com/apache/activemq-artemis/pull/3796#discussion_r731860622
##########
File path:
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
##########
@@ -1726,4 +1791,103 @@ public Object getOwner() {
public void setOwner(Object object) {
this.owner = object;
}
+
+
+ //
*******************************************************************************************************************************
+ // Composite Data implementation
+
+ private static MessageOpenTypeFactory AMQP_FACTORY = new
AmqpMessageOpenTypeFactory();
+
+ static class AmqpMessageOpenTypeFactory extends
MessageOpenTypeFactory<AMQPMessage> {
+ @Override
+ protected void init() throws OpenDataException {
+ super.init();
+ addItem(CompositeDataConstants.TEXT_BODY,
CompositeDataConstants.TEXT_BODY, SimpleType.STRING);
+ addItem(CompositeDataConstants.TYPE,
CompositeDataConstants.TYPE_DESCRIPTION, SimpleType.BYTE);
+ }
+
+ @Override
+ public Map<String, Object> getFields(AMQPMessage m, int valueSizeLimit,
int delivery) throws OpenDataException {
+ Map<String, Object> rc = super.getFields(m, valueSizeLimit, delivery);
+
+ if (!m.isLargeMessage()) {
+ m.ensureScanning();
+ }
+
+ Properties properties = m.getCurrentProperties();
+
+ byte type = getType(m, properties);
+
+ rc.put(CompositeDataConstants.TYPE, type);
+
+ if (m.isLargeMessage()) {
+ rc.put(CompositeDataConstants.TEXT_BODY, "... Large message ...");
+ } else {
+ if (m.getBody() instanceof AmqpValue) {
+ Object amqpValue = ((AmqpValue) m.getBody()).getValue();
+
+ rc.put(CompositeDataConstants.TEXT_BODY,
JsonUtil.truncateString(amqpValue.toString(), valueSizeLimit));
Review comment:
Thats true, it will return null if there is simply no [amqp-value]
section, and an instanceof check will then return false for the null.
I am talking about a different case though where there is an amqp-value
section, but it actually contains an encoded null. That will return the section
object, which then returns null for its value. This code would NPE on the
toString().
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
