Author: rgodfrey
Date: Sat Jun 13 09:02:04 2015
New Revision: 1685224
URL: http://svn.apache.org/r1685224
Log:
QPID-6587 : Conversion of 1-0 message to 0-10 causes NPE if the 1-0 message
does not have an application properties section
Modified:
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
Modified:
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java?rev=1685224&r1=1685223&r2=1685224&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
Sat Jun 13 09:02:04 2015
@@ -592,7 +592,7 @@ public class MessageMetaData_1_0 impleme
public Map<String, Object> getHeadersAsMap()
{
- return new HashMap<String, Object>(_appProperties);
+ return _appProperties == null ? new HashMap<String,Object>() : new
HashMap<>(_appProperties);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
