diff options
| author | Robert Gemmell <robbie@apache.org> | 2014-06-24 13:34:59 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2014-06-24 13:34:59 +0000 |
| commit | 39ac41b40e63f72d7cc555f72040754d17c647bd (patch) | |
| tree | fccbb3e9ecf904c3cd22a57baac2aa76ca52a869 | |
| parent | ffe75d935743d15d313ee2e81aae7854a0a3cd05 (diff) | |
| download | qpid-python-39ac41b40e63f72d7cc555f72040754d17c647bd.tar.gz | |
QPID-5792: add null check to avoid NPE during Destination decoding
Applied patch from Dejan Bosanac
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1605078 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageImpl.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageImpl.java index f2d0cb5b18..9400619061 100644 --- a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageImpl.java +++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageImpl.java @@ -1347,13 +1347,16 @@ public abstract class MessageImpl implements Message { StringBuilder result = new StringBuilder(); - for (Object o : items) + if (items != null) { - if (result.length() > 0) + for (Object o : items) { - result.append(sep); + if (result.length() > 0) + { + result.append(sep); + } + result.append(o.toString()); } - result.append(o.toString()); } return result.toString(); |