You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2017/05/22 16:22:49 UTC
[7/7] qpid-broker-j git commit: QPID-7723: [0-10] Allow header to be
optional when computing the encoded size
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/400e7ec7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/400e7ec7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/400e7ec7
Branch: refs/heads/6.1.x
Commit: 400e7ec7090fd2135996a43343e885889adfd78d
Parents: 7772251
Author: Keith Wall <kw...@apache.org>
Authored: Wed May 17 10:59:58 2017 +0100
Committer: Lorenz Quack <lq...@apache.org>
Committed: Mon May 22 16:51: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/400e7ec7/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 403c554..80e8a51 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.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: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org