--- a/loggingservices/eventlogger/LogServ/src/LogServOperationBase.cpp Tue Aug 31 16:57:14 2010 +0300
+++ b/loggingservices/eventlogger/LogServ/src/LogServOperationBase.cpp Wed Sep 01 12:39:58 2010 +0100
@@ -29,8 +29,7 @@
iPackage(aPackage),
iMessage(aMessage),
iClientServerData(aClientServerData),
- iSessionId(aSessionId),
- iMessageCompletion(ETrue)
+ iSessionId(aSessionId)
{
// Queue this operations
OperationManager().OMOperationQueueAdd(*this);
@@ -64,12 +63,8 @@
//
void CLogServOperationBase::Complete(TInt aCompletionCode)
{
- __ASSERT_ALWAYS(! iMessage.IsNull(), Panic(ELogNoOutstandingAsyncRequest));
-
- if (iMessageCompletion)
- {
- iMessage.Complete(aCompletionCode);
- }
+ __ASSERT_ALWAYS(iMessage != RMessage2(), Panic(ELogNoOutstandingAsyncRequest));
+ iMessage.Complete(aCompletionCode);
// Unnecessary?
iMessage = RMessage2();