You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@activemq.apache.org by ta...@apache.org on 2013/06/06 17:07:40 UTC

svn commit: r1490317 - /activemq/trunk/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java

Author: tabish
Date: Thu Jun  6 15:07:39 2013
New Revision: 1490317

URL: http://svn.apache.org/r1490317
Log:
https://issues.apache.org/jira/browse/AMQ-4568

fix potential NPE

Modified:
    activemq/trunk/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java

Modified: activemq/trunk/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java?rev=1490317&r1=1490316&r2=1490317&view=diff
==============================================================================
--- activemq/trunk/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java (original)
+++ activemq/trunk/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java Thu Jun  6 15:07:39 2013
@@ -514,6 +514,10 @@ class AmqpProtocolConverter {
             message.setProducerId(producerId);
 
             MessageId messageId = message.getMessageId();
+            if (messageId == null) {
+                messageId = new MessageId();
+            }
+
             messageId.setProducerId(producerId);
             messageId.setProducerSequenceId(messageIdGenerator.getNextSequenceId());