Author: robbie
Date: Tue Jun 24 13:34:59 2014
New Revision: 1605078
URL: http://svn.apache.org/r1605078
Log:
QPID-5792: add null check to avoid NPE during Destination decoding
Applied patch from Dejan Bosanac
Modified:
qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageImpl.java
Modified:
qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageImpl.java?rev=1605078&r1=1605077&r2=1605078&view=diff
==============================================================================
---
qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageImpl.java
(original)
+++
qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageImpl.java
Tue Jun 24 13:34:59 2014
@@ -1347,13 +1347,16 @@ public abstract class MessageImpl implem
{
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();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
