diff options
Diffstat (limited to 'qpid/java/client/src')
| -rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java | 2 | ||||
| -rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java index f717ca4655..9efc670e99 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java @@ -204,7 +204,7 @@ public class BasicMessageProducer_0_10 extends BasicMessageProducer } ByteBuffer data = message.getData(); - messageProps.setContentLength(data.remaining()); + messageProps.setContentLength(data == null ? 0 : data.remaining()); // send the message try diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java index 0b05179215..af36c75ef2 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java @@ -450,9 +450,9 @@ public class JMSMapMessage extends AbstractJMSMessage implements javax.jms.MapMe protected void populateMapFromData(ByteBuffer data) throws JMSException { - TypedBytesContentReader reader = new TypedBytesContentReader(data); if (data != null) { + TypedBytesContentReader reader = new TypedBytesContentReader(data); data.rewind(); final int entries = reader.readIntImpl(); |