loggingservices/eventlogger/LogServ/src/LogServOperationBase.cpp
changeset 40 b8bdbc8f59c7
parent 0 08ec8eefde2f
child 45 cc28652e0254
--- a/loggingservices/eventlogger/LogServ/src/LogServOperationBase.cpp	Thu Jul 08 12:09:58 2010 +0100
+++ b/loggingservices/eventlogger/LogServ/src/LogServOperationBase.cpp	Thu Aug 12 11:53:23 2010 +0100
@@ -29,7 +29,8 @@
 	iPackage(aPackage), 
 	iMessage(aMessage),
 	iClientServerData(aClientServerData),
-	iSessionId(aSessionId)
+	iSessionId(aSessionId),
+	iMessageCompletion(ETrue)
 	{
 	// Queue this operations
 	OperationManager().OMOperationQueueAdd(*this);
@@ -63,8 +64,12 @@
 //
 void CLogServOperationBase::Complete(TInt aCompletionCode)
 	{
-	__ASSERT_ALWAYS(iMessage != RMessage2(), Panic(ELogNoOutstandingAsyncRequest));
-	iMessage.Complete(aCompletionCode);
+	__ASSERT_ALWAYS(! iMessage.IsNull(), Panic(ELogNoOutstandingAsyncRequest));
+	
+	if (iMessageCompletion)
+	  {
+	  iMessage.Complete(aCompletionCode);
+	  }
 
 	// Unnecessary?
 	iMessage = RMessage2();