You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/05/17 10:01:25 UTC
[1/2] qpid-broker-j git commit: QPID-7723: [0-10] Allow header to be
optional when computing the encoded size
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 <kw...@apache.org>
Authored: Wed May 17 10:59:58 2017 +0100
Committer: Keith Wall <kw...@apache.org>
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: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-broker-j git commit: Revert "QPID-7775: Fix failing test"
Posted by kw...@apache.org.
Revert "QPID-7775: Fix failing test"
This reverts commit 9345d2d795b6a124906b8a0f8c68ab51a4b379cb.
This was the wrong change. See QPID-7723 for correct fix.
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/9e49b5d8
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/9e49b5d8
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/9e49b5d8
Branch: refs/heads/master
Commit: 9e49b5d8589dee0403ae70ea0f6f847c782c8e97
Parents: cfb035e
Author: Keith Wall <kw...@apache.org>
Authored: Wed May 17 11:00:20 2017 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Wed May 17 11:00:20 2017 +0100
----------------------------------------------------------------------
.../org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/9e49b5d8/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
index ca26e8a..c0dba92 100644
--- a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
+++ b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
@@ -40,7 +40,6 @@ import org.apache.qpid.server.model.Transport;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.port.AmqpPort;
import org.apache.qpid.server.model.BrokerTestHelper;
-import org.apache.qpid.server.protocol.v0_10.transport.Header;
import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.server.protocol.v0_10.transport.Binary;
import org.apache.qpid.server.protocol.v0_10.transport.ExecutionErrorCode;
@@ -131,7 +130,6 @@ public class ServerSessionTest extends QpidTestCase
MessageTransfer xfr = new MessageTransfer();
xfr.setBody(new byte[2048]);
- xfr.setHeader(new Header(null, null));
delegate.messageTransfer(session, xfr);
assertFalse("No methods invoked - expecting at least 1", invokedMethods.isEmpty());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org