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

[ta...@apache.org]

Author: tabish
Date: Fri Jun 14 15:18:51 2013
New Revision: 1493110

URL: http://svn.apache.org/r1493110
Log:
Fix for 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=1493110&r1=1493109&r2=1493110&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 Fri Jun 14 15:18:51 2013
@@ -348,8 +348,11 @@ class AmqpProtocolConverter {
             MessageDispatch md = (MessageDispatch) command;
             ConsumerContext consumerContext = subscriptionsByConsumerId.get(md.getConsumerId());
             if (consumerContext != null) {
-                if (LOG.isTraceEnabled()) {
+                // End of Queue Browse will have no Message object.
+                if (LOG.isTraceEnabled() && md.getMessage() != null) {
                     LOG.trace("Dispatching MessageId:{} to consumer", md.getMessage().getMessageId());
+                } else {
+                    LOG.trace("Dispatching End of Browse Command to consumer {}", md.getConsumerId());
                 }
                 consumerContext.onMessageDispatch(md);
             }