You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/05/04 16:22:46 UTC
svn commit: r399710 -
/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java
Author: chirino
Date: Thu May 4 07:22:44 2006
New Revision: 399710
URL: http://svn.apache.org/viewcvs?rev=399710&view=rev
Log:
Avoid NPE in MasterBroker.processDispatch... a null message is sent to the client to signal end of queue browse.
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java?rev=399710&r1=399709&r2=399710&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java Thu May 4 07:22:44 2006
@@ -285,7 +285,8 @@
mdn.setConsumerId(messageDispatch.getConsumerId());
mdn.setDeliverySequenceId(messageDispatch.getDeliverySequenceId());
mdn.setDestination(messageDispatch.getDestination());
- mdn.setMessageId(messageDispatch.getMessage().getMessageId());
+ if( messageDispatch.getMessage() != null )
+ mdn.setMessageId(messageDispatch.getMessage().getMessageId());
sendAsyncToSlave(mdn);
super.processDispatch(messageDispatch);
}