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/23 09:03:41 UTC
[4/4] qpid-broker-j git commit: Revert "QPID-7723: [0-10] Allow
header to be optional when computing the encoded size"
Revert "QPID-7723: [0-10] Allow header to be optional when computing the encoded size"
This reverts commit 400e7ec7090fd2135996a43343e885889adfd78d.
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/18bd89e7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/18bd89e7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/18bd89e7
Branch: refs/heads/6.1.x
Commit: 18bd89e753d7b4759dfcdb1d118e6a07af6940bf
Parents: 400e7ec
Author: Lorenz Quack <lq...@apache.org>
Authored: Tue May 23 09:39:55 2017 +0100
Committer: Lorenz Quack <lq...@apache.org>
Committed: Tue May 23 09:55:10 2017 +0100
----------------------------------------------------------------------
.../protocol/v0_10/MessageMetaData_0_10.java | 29 +++++++++-----------
1 file changed, 13 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/18bd89e7/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 80e8a51..403c554 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 final Header _header;
+ private Header _header;
private DeliveryProperties _deliveryProps;
private MessageProperties _messageProps;
private MessageTransferHeader _messageHeader;
@@ -85,7 +85,6 @@ public class MessageMetaData_0_10 implements StorableMessageMetaData
}
- @Override
public int getStorableSize()
{
int len = 0;
@@ -94,23 +93,21 @@ public class MessageMetaData_0_10 implements StorableMessageMetaData
len += 4; // body size
len += 4; // headers length
- if (_header != null)
+ if(_header.getDeliveryProperties() != null)
{
- if(_header.getDeliveryProperties() != null)
- {
- len += EncoderUtils.getStruct32Length(_header.getDeliveryProperties());
- }
- if(_header.getMessageProperties() != null)
- {
- len += EncoderUtils.getStruct32Length(_header.getMessageProperties());
- }
- if(_header.getNonStandardProperties() != null)
+ len += EncoderUtils.getStruct32Length(_header.getDeliveryProperties());
+ }
+ if(_header.getMessageProperties() != null)
+ {
+ len += EncoderUtils.getStruct32Length(_header.getMessageProperties());
+ }
+ if(_header.getNonStandardProperties() != null)
+ {
+ for(Struct header : _header.getNonStandardProperties())
{
- for(Struct header : _header.getNonStandardProperties())
- {
- len += EncoderUtils.getStruct32Length(header);
- }
+ 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