Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid NPE in MasterBroker.processDispatch... a null message is sent to the client to signal end of queue browse. 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@399710 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2006-05-04 14:22:44 +00:00
parent fccef1010d
commit 6e329f7d9e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java
View File

@ -285,7 +285,8 @@ public class MasterBroker extends InsertableMutableBrokerFilter{
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);
}