messagingfw/wappushfw/SISLPushMsgUtils/src/SISLPushMsgUtils.cpp
changeset 58 6c34d0baa0b1
parent 0 8e480a14352b
--- a/messagingfw/wappushfw/SISLPushMsgUtils/src/SISLPushMsgUtils.cpp	Tue Oct 05 13:50:47 2010 +0530
+++ b/messagingfw/wappushfw/SISLPushMsgUtils/src/SISLPushMsgUtils.cpp	Tue Oct 19 11:59:06 2010 +0530
@@ -275,9 +275,12 @@
 		pushMsg = CSLPushMsgEntry::NewL();
 		}
 
-	CleanupStack::PushL(pushMsg);
-	pushMsg->RetrieveL(Session(), iMsvEntry->EntryId());
-	CleanupStack::Pop(pushMsg);
+	if(pushMsg)
+        {
+        CleanupStack::PushL(pushMsg);
+        pushMsg->RetrieveL(Session(), iMsvEntry->EntryId());
+        CleanupStack::Pop(pushMsg);
+        }
 
 	return pushMsg;
 	}
@@ -527,16 +530,18 @@
 	iMsvEntry->SetEntryL(aId);
 
 	CPushMsgEntryBase* pushEntry = GetPushMsgEntryL(aPushType);
-
-	if (aPushType == KUidWapPushMsgSI)
-		{
-		date = STATIC_CAST(CSIPushMsgEntry*, pushEntry) ->Created();
-		}
-	else if (aPushType == KUidWapPushMsgSL)
-		{
-		date = STATIC_CAST(CSLPushMsgEntry*, pushEntry) ->TimeSent();
-		}
-	delete pushEntry;
+	if(pushEntry)
+        {
+        if (aPushType == KUidWapPushMsgSI)
+            {
+            date = STATIC_CAST(CSIPushMsgEntry*, pushEntry) ->Created();
+            }
+        else if (aPushType == KUidWapPushMsgSL)
+            {
+            date = STATIC_CAST(CSLPushMsgEntry*, pushEntry) ->TimeSent();
+            }
+        delete pushEntry;
+        }
 	return date;
 	}