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

Fixing patch for AMQ-824 - adding NULL check for MessageConsumer::autoAcknowledge 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@425574 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nathan Christopher Mittler 2006-07-26 00:44:39 +00:00
parent 859caee9d2
commit 95fec7d0db
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openwire-cpp/src/main/cpp/activemq/MessageConsumer.cpp
View File

@ -216,9 +216,12 @@ void MessageConsumer::checkClosed() throw(CmsException)
p<IMessage> MessageConsumer::autoAcknowledge(p<IMessage> message) p<IMessage> MessageConsumer::autoAcknowledge(p<IMessage> message)
{ {
try try
{
if( message != NULL )
{ {
// Is the message an ActiveMQMessage? (throws bad_cast otherwise) // Is the message an ActiveMQMessage? (throws bad_cast otherwise)
p<ActiveMQMessage> activeMessage = p_dyncast<ActiveMQMessage> (message) ; p<ActiveMQMessage> activeMessage =
p_dyncast<ActiveMQMessage> (message);
// Register the handler for client acknowledgment // Register the handler for client acknowledgment
activeMessage->setAcknowledger( smartify(this) ); activeMessage->setAcknowledger( smartify(this) );
@ -226,10 +229,13 @@ p<IMessage> MessageConsumer::autoAcknowledge(p<IMessage> message)
if( acknowledgementMode != ClientAckMode ) if( acknowledgementMode != ClientAckMode )
doAcknowledge(activeMessage); doAcknowledge(activeMessage);
} }
}
catch( bad_cast& bc ) catch( bad_cast& bc )
{ {
// ignore // ignore
} }
// Return the message even if NULL, caller must determine what to do.
return message; return message;
} }