Repository: qpid-broker-j Updated Branches: refs/heads/master b63815ceb -> 9e49b5d85
QPID-7723: [0-10] Allow header to be optional when computing the encoded size Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/cfb035e6 Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/cfb035e6 Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/cfb035e6 Branch: refs/heads/master Commit: cfb035e6e2f7f8e9600a98b77d39adf6783ef21d Parents: b63815c Author: Keith Wall <[email protected]> Authored: Wed May 17 10:59:58 2017 +0100 Committer: Keith Wall <[email protected]> Committed: Wed May 17 10:59:58 2017 +0100 ---------------------------------------------------------------------- .../protocol/v0_10/MessageMetaData_0_10.java | 29 +++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/cfb035e6/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java index 031ae17..8bcb8ae 100755 --- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java +++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java @@ -38,7 +38,7 @@ import org.apache.qpid.server.protocol.v0_10.transport.Struct; public class MessageMetaData_0_10 implements StorableMessageMetaData { - private Header _header; + private final Header _header; private DeliveryProperties _deliveryProps; private MessageProperties _messageProps; private MessageTransferHeader _messageHeader; @@ -85,6 +85,7 @@ public class MessageMetaData_0_10 implements StorableMessageMetaData } + @Override public int getStorableSize() { int len = 0; @@ -93,21 +94,23 @@ public class MessageMetaData_0_10 implements StorableMessageMetaData len += 4; // body size len += 4; // headers length - if(_header.getDeliveryProperties() != null) - { - len += EncoderUtils.getStruct32Length(_header.getDeliveryProperties()); - } - if(_header.getMessageProperties() != null) - { - len += EncoderUtils.getStruct32Length(_header.getMessageProperties()); - } - if(_header.getNonStandardProperties() != null) + if (_header != null) { - for(Struct header : _header.getNonStandardProperties()) + if(_header.getDeliveryProperties() != null) { - len += EncoderUtils.getStruct32Length(header); + len += EncoderUtils.getStruct32Length(_header.getDeliveryProperties()); + } + if(_header.getMessageProperties() != null) + { + len += EncoderUtils.getStruct32Length(_header.getMessageProperties()); + } + if(_header.getNonStandardProperties() != null) + { + for(Struct header : _header.getNonStandardProperties()) + { + len += EncoderUtils.getStruct32Length(header); + } } - } return len; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
