summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageImpl.java11
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();