summaryrefslogtreecommitdiff
path: root/qpid/java/client/src
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2014-03-03 15:35:25 +0000
committerRobert Godfrey <rgodfrey@apache.org>2014-03-03 15:35:25 +0000
commit0d6d2adbb434f05f63414fc3fb5441345666a862 (patch)
treed8551a39259683d58d1b1a82c003b1b8fe4919b5 /qpid/java/client/src
parentaf2c37483f182bb67fd71a1fbb68f921c839728b (diff)
downloadqpid-python-0d6d2adbb434f05f63414fc3fb5441345666a862.tar.gz
QPID-5596 : [Java] Address bugs found by FindBugs
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1573586 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/client/src')
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java2
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java2
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();