--- a/messagingfw/msgsrvnstore/server/src/MTCLBASE.CPP Tue Jul 06 14:48:25 2010 +0300
+++ b/messagingfw/msgsrvnstore/server/src/MTCLBASE.CPP Wed Aug 18 10:15:32 2010 +0300
@@ -687,10 +687,12 @@
*/
EXPORT_C void CBaseMtm::CancelAttachmentOperation()
{
- __ASSERT_ALWAYS(iAttachmentWaiter != NULL, PanicServer(EMsvOperationNotFound));
- iAttachmentWaiter->Cancel();
- delete iAttachmentWaiter;
- iAttachmentWaiter = NULL;
+ if(iAttachmentWaiter)
+ {
+ iAttachmentWaiter->Cancel();
+ delete iAttachmentWaiter;
+ iAttachmentWaiter = NULL;
+ }
}