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 10:09:22 UTC
[6/6] qpid-broker-j git commit: QPID-7796: [Java Broker] Guard
against NPE in 0-10 when storing messages without header
QPID-7796: [Java Broker] Guard against NPE in 0-10 when storing messages without header
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/b77dcd8a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/b77dcd8a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/b77dcd8a
Branch: refs/heads/6.0.x
Commit: b77dcd8a3d66e7c183444adad90fdb105b3815a2
Parents: 8f3a80b
Author: Lorenz Quack <lq...@apache.org>
Authored: Tue May 23 09:52:24 2017 +0100
Committer: Lorenz Quack <lq...@apache.org>
Committed: Tue May 23 10:42:04 2017 +0100
----------------------------------------------------------------------
.../protocol/v0_10/MessageMetaData_0_10.java | 49 +++++++++++---------
1 file changed, 27 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b77dcd8a/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 831ceb7..9dcdc4b 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
@@ -104,37 +104,42 @@ public class MessageMetaData_0_10 implements StorableMessageMetaData
encoder.writeInt64(_arrivalTime);
encoder.writeInt32(_bodySize);
int headersLength = 0;
- if(_header.getDeliveryProperties() != null)
+ if (_header != null)
{
- headersLength++;
- }
- if(_header.getMessageProperties() != null)
- {
- headersLength++;
- }
- if(_header.getNonStandardProperties() != null)
- {
- headersLength += _header.getNonStandardProperties().size();
+ if (_header.getDeliveryProperties() != null)
+ {
+ headersLength++;
+ }
+ if (_header.getMessageProperties() != null)
+ {
+ headersLength++;
+ }
+ if (_header.getNonStandardProperties() != null)
+ {
+ headersLength += _header.getNonStandardProperties().size();
+ }
}
encoder.writeInt32(headersLength);
- if(_header.getDeliveryProperties() != null)
+ if (_header != null)
{
- encoder.writeStruct32(_header.getDeliveryProperties());
- }
- if(_header.getMessageProperties() != null)
- {
- encoder.writeStruct32(_header.getMessageProperties());
- }
- if(_header.getNonStandardProperties() != null)
- {
-
- for(Struct header : _header.getNonStandardProperties())
+ if (_header.getDeliveryProperties() != null)
+ {
+ encoder.writeStruct32(_header.getDeliveryProperties());
+ }
+ if (_header.getMessageProperties() != null)
{
- encoder.writeStruct32(header);
+ encoder.writeStruct32(_header.getMessageProperties());
}
+ if (_header.getNonStandardProperties() != null)
+ {
+ for (Struct header : _header.getNonStandardProperties())
+ {
+ encoder.writeStruct32(header);
+ }
+ }
}
QpidByteBuffer buf = encoder.getBuffer();
encoder.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org