# HG changeset patch
# User hgs
# Date 1280849921 -19800
# Node ID e7635922c07427819bbd504cf9b5fdfcf05e5fb2
# Parent  b66b8f3a7fd8e34c439e5ed10ef2ec7a87c60867
201031_01

diff -r b66b8f3a7fd8 -r e7635922c074 messagingfw/msgsrvnstore/server/inc/msventryfreepool.h
--- a/messagingfw/msgsrvnstore/server/inc/msventryfreepool.h	Wed Jul 21 02:03:54 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/inc/msventryfreepool.h	Tue Aug 03 21:08:41 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -53,7 +53,7 @@
 public:
 	static CMsvEntryFreePool* Instance();	
 	CMsvCacheEntry* EntryL();
-	void ReleaseEntry(CMsvCacheEntry* aMsvCacheEntry, TBool aBypassTransaction = EFalse);
+	void ReleaseEntryL(CMsvCacheEntry* aMsvCacheEntry, TBool aBypassTransaction = EFalse);
 	void ReleaseEntrySet(RPointerArray<CMsvCacheEntry>& aMsvCacheEntryArray);
 	void DoReleaseEntrySetL(RPointerArray<CMsvCacheEntry>& aMsvCacheEntryArray);
 	void SetEssentialParam(TDblQue<CMsvCacheVisibleFolder>* aEntryCache, CMsvIndexAdapter* aAdapterObj);
diff -r b66b8f3a7fd8 -r e7635922c074 messagingfw/msgsrvnstore/server/src/CMsvPlainBodyText.cpp
--- a/messagingfw/msgsrvnstore/server/src/CMsvPlainBodyText.cpp	Wed Jul 21 02:03:54 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/src/CMsvPlainBodyText.cpp	Tue Aug 03 21:08:41 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -608,7 +608,7 @@
 			}
 
 		// Push start position of current chunk in to the stack.
-		iStartPosOfEachChunkInFile.Append(iStartPosOfNextChunk);
+		iStartPosOfEachChunkInFile.AppendL(iStartPosOfNextChunk);
 		iStartPosOfNextChunk += numOfBytesInCurrentChunk;
 		iReadChunkLength = numOfBytesInCurrentChunk;
 		}
@@ -919,7 +919,7 @@
 				else
 					{
 					// Push Start position of current chunk in to the stack.
-					iStartPosOfEachChunkInFile.Append(iStartPosOfNextChunk);
+					iStartPosOfEachChunkInFile.AppendL(iStartPosOfNextChunk);
 					iStartPosOfNextChunk += numOfBytesInCurrentChunk;
 					}
 				iReadChunkLength = numOfBytesInCurrentChunk;
diff -r b66b8f3a7fd8 -r e7635922c074 messagingfw/msgsrvnstore/server/src/cmsvconverterwaiter.cpp
--- a/messagingfw/msgsrvnstore/server/src/cmsvconverterwaiter.cpp	Wed Jul 21 02:03:54 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/src/cmsvconverterwaiter.cpp	Tue Aug 03 21:08:41 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -230,7 +230,7 @@
 			TConversionQueue request;
 			request.iDriveNumber = driveNumber;
 			request.iMessage = aMessage;
-			iConverterQueue.Append(request);
+			iConverterQueue.AppendL(request);
 			}
 	
 		iDriveNumber = driveNumber;
@@ -291,7 +291,7 @@
 			TConversionQueue request;
 			request.iDriveNumber = driveNumber;
 			request.iMessage = aMessage;
-			iConverterQueue.Append(request);
+			iConverterQueue.AppendL(request);
 			}
 		else
 			{
diff -r b66b8f3a7fd8 -r e7635922c074 messagingfw/msgsrvnstore/server/src/cmsvversion1version2converter.cpp
--- a/messagingfw/msgsrvnstore/server/src/cmsvversion1version2converter.cpp	Wed Jul 21 02:03:54 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/src/cmsvversion1version2converter.cpp	Tue Aug 03 21:08:41 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -903,7 +903,7 @@
 			RArray<TMsvId> mimeIdArray;
 			CleanupClosePushL(mimeIdArray);
 			
-			mimeIdArray.Append(iDArray[i]);
+			mimeIdArray.AppendL(iDArray[i]);
 			iDBAdapter.GetAllMimeIdsL(iDArray[i],mimeIdArray);
 						
 			if(mimeIdArray.Count())
@@ -1801,7 +1801,7 @@
 		RReadStream infoMimeHeader(buf);
 		
 		RBuf8 mimeStr;
-		mimeStr.Create(KMaxBufferLength);
+		mimeStr.CreateL(KMaxBufferLength);
 		CleanupClosePushL(mimeStr);
 				
 		TInt version = infoMimeHeader.ReadUint16L();
diff -r b66b8f3a7fd8 -r e7635922c074 messagingfw/msgsrvnstore/server/src/msvcacheindextableentry.Cpp
--- a/messagingfw/msgsrvnstore/server/src/msvcacheindextableentry.Cpp	Wed Jul 21 02:03:54 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/src/msvcacheindextableentry.Cpp	Tue Aug 03 21:08:41 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -192,11 +192,11 @@
 				{
 				if(!aReplace)
 					{
-					CMsvEntryFreePool::Instance()->ReleaseEntry(aEntry);
+					CMsvEntryFreePool::Instance()->ReleaseEntryL(aEntry);
 					aEntry = (*iBlockPtr)[blockIndex];
 					return;
 					}
-				CMsvEntryFreePool::Instance()->ReleaseEntry((*iBlockPtr)[blockIndex]);
+				CMsvEntryFreePool::Instance()->ReleaseEntryL((*iBlockPtr)[blockIndex]);
 				iBlockPtr->Remove(blockIndex);
 				iBlockPtr->Insert(aEntry, blockIndex);
 				return;
@@ -296,9 +296,9 @@
 				{
 				if(aEntries[listCount+aInitIndex]->GetId() == (*iBlockPtr)[blockIndex]->GetId())
 					{
-					CMsvEntryFreePool::Instance()->ReleaseEntry(aEntries[listCount+aInitIndex]);
+					CMsvEntryFreePool::Instance()->ReleaseEntryL(aEntries[listCount+aInitIndex]);
 					aEntries.Remove(listCount+aInitIndex);
-					aEntries.Insert((*iBlockPtr)[blockIndex], listCount+aInitIndex);
+					aEntries.InsertL((*iBlockPtr)[blockIndex], listCount+aInitIndex);
 					entryFound = ETrue;
 					break;
 					}
@@ -433,7 +433,7 @@
 			if(aForceDelete || (*iBlockPtr)[index]->IsEntryLocked())
 				{
 				aParentIdOfEntry = (*iBlockPtr)[index]->Entry().Parent();
-				CMsvEntryFreePool::Instance()->ReleaseEntry((*iBlockPtr)[index]);
+				CMsvEntryFreePool::Instance()->ReleaseEntryL((*iBlockPtr)[index]);
 				iBlockPtr->Remove(index);
 				// 2.1.1. If the entry deleted was the last entry in the block,
 				//        delete the block.
@@ -728,7 +728,7 @@
 	for(TInt index=0; index<blockSize; ++index)
 		{
 		RBuf text;
-		text.Create(150);
+		text.CreateL(150);
 		text.Append(KId);
 		text.AppendNum((*iBlockPtr)[index]->Entry().Id());
 		text.Append(KParentId);
diff -r b66b8f3a7fd8 -r e7635922c074 messagingfw/msgsrvnstore/server/src/msvcachevisiblefolder.Cpp
--- a/messagingfw/msgsrvnstore/server/src/msvcachevisiblefolder.Cpp	Wed Jul 21 02:03:54 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/src/msvcachevisiblefolder.Cpp	Tue Aug 03 21:08:41 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -379,7 +379,7 @@
 								}
 							else
 								{
-								CMsvEntryFreePool::Instance()->ReleaseEntry((*blockPtr)[count]);
+								CMsvEntryFreePool::Instance()->ReleaseEntryL((*blockPtr)[count]);
 								}
 							}
 						blockPtr->Reset();
@@ -584,7 +584,7 @@
 			{
 			//1.2.1 yes, only few blocks are dirty, so fetch and fill the dirty blocks
 			RBuf8 buf;
-			buf.Create(2000);
+			buf.CreateL(2000);
 			CleanupClosePushL(buf);
 			TBool isDBOperationReqd = EFalse;
 			for(TInt index=0; index < iIndexTable.Count(); ++index)
@@ -694,7 +694,7 @@
 		else
 			{
 			RBuf8 buf;
-			buf.Create(2000);
+			buf.CreateL(2000);
 			CleanupClosePushL(buf);
 			CMsvCacheEntry* childEntry;
 			TBool isDBOperationReqd = EFalse;
@@ -1193,7 +1193,7 @@
 	for(TInt index=0; index < blockCount; index++)
 		{
 		RBuf8 text;
-		text.Create(100);
+		text.CreateL(100);
 		text.Append(KBlock);
 		text.AppendNum(index+1);
 		aLogger.Write(text);
diff -r b66b8f3a7fd8 -r e7635922c074 messagingfw/msgsrvnstore/server/src/msvdbadapter.cpp
--- a/messagingfw/msgsrvnstore/server/src/msvdbadapter.cpp	Wed Jul 21 02:03:54 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/src/msvdbadapter.cpp	Tue Aug 03 21:08:41 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -1251,7 +1251,7 @@
 	   KUidMsvFolderEntryValue == aEntry->Entry().iType.iUid
 	  )
 		{
-		CMsvEntryFreePool::Instance()->ReleaseEntry(aEntry);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(aEntry);
 		User::Leave(KErrNotFound);
 		}
 	
@@ -4308,7 +4308,7 @@
 	
 	while(KSqlAtRow == Idquerystatement.Next())
 		{
-		aIdArray.Append(ColumnInt(Idquerystatement, Idindex));
+		aIdArray.AppendL(ColumnInt(Idquerystatement, Idindex));
 		}
 		
 	CleanupStack::PopAndDestroy(2);  //buf,Idquerystatement
@@ -4358,12 +4358,12 @@
 			type == KUidMsvEmailRtfEntryValue
 			)
 			{
-			aIdArray.Append(childId);
+			aIdArray.AppendL(childId);
 			}
 		// Recursion for alternate folders
 		else if(type == KUidMsvFolderEntryValue)
 			{
-			aIdArray.Append(childId);
+			aIdArray.AppendL(childId);
 			// also get the childs for these messages
 			GetAllMimeIdsL(childId, aIdArray);
 			}
diff -r b66b8f3a7fd8 -r e7635922c074 messagingfw/msgsrvnstore/server/src/msventryfreepool.cpp
--- a/messagingfw/msgsrvnstore/server/src/msventryfreepool.cpp	Wed Jul 21 02:03:54 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/src/msventryfreepool.cpp	Tue Aug 03 21:08:41 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -387,7 +387,7 @@
  * The function resets and appends the passed 
  * entry to freepool so that it can be reused.
  */
-void CMsvEntryFreePool::ReleaseEntry(CMsvCacheEntry* aMsvCacheEntry, TBool aBypassTransaction /* DEFAULT=EFalse*/)
+void CMsvEntryFreePool::ReleaseEntryL(CMsvCacheEntry* aMsvCacheEntry, TBool aBypassTransaction /* DEFAULT=EFalse*/)
 	{
 	if( NULL == aMsvCacheEntry )
 		{
@@ -396,7 +396,7 @@
 	
 	if(isTransactionOpen && (EFalse == aBypassTransaction))
 		{
-		iMsvTmpEntries.Append(aMsvCacheEntry);
+		iMsvTmpEntries.AppendL(aMsvCacheEntry);
 		}
 	else
 		{
@@ -404,7 +404,7 @@
 		aMsvCacheEntry->ResetEntry();
 	
 		// 2. Append entry to the freepool.
-		iMsvEntries->Append(aMsvCacheEntry);
+		iMsvEntries->AppendL(aMsvCacheEntry);
 		}
 	}
 
diff -r b66b8f3a7fd8 -r e7635922c074 messagingfw/msgsrvnstore/server/src/msvindexadapter.cpp
--- a/messagingfw/msgsrvnstore/server/src/msvindexadapter.cpp	Wed Jul 21 02:03:54 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/src/msvindexadapter.cpp	Tue Aug 03 21:08:41 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -109,7 +109,7 @@
         delete folderNode;
         }
     
-    iFreePoolInstance->ReleaseEntry(iRootEntry);
+    iFreePoolInstance->ReleaseEntryL(iRootEntry);
     iRootEntry = NULL;
 
     // 3. Delete internal data structure.
@@ -976,7 +976,7 @@
 	TMsvId parentId = entry->Entry().Parent();
 	if(releaseEntry)
 		{
-		iFreePoolInstance->ReleaseEntry(entry, ETrue);
+		iFreePoolInstance->ReleaseEntryL(entry, ETrue);
 		}
 	CMsvEntrySelection* children = new(ELeave)CMsvEntrySelection;
 	CleanupStack::PushL(children);
@@ -1051,7 +1051,7 @@
 	// Release the entry, since it is not added to cache.
 	if(releaseEntry)
 		{
-		iFreePoolInstance->ReleaseEntry(entry, ETrue);
+		iFreePoolInstance->ReleaseEntryL(entry, ETrue);
 		}
 	User::LeaveIfError(err);
 	CleanupStack::PopAndDestroy(); //children
@@ -1487,7 +1487,7 @@
                                                  newParentEntry,
                                                  descendentList,
                                                  resetOldParentOwnerFlag);
-        iNonCommittedChangedEntryList.Append(entryDetails);
+        iNonCommittedChangedEntryList.AppendL(entryDetails);
         if(descendentList)
             CleanupStack::Pop(descendentList);
         }
@@ -1672,7 +1672,7 @@
 		if(aIsDanglingEntry)
 			{
 			// Release CMsvCacheEntry to freepool.
-			iFreePoolInstance->ReleaseEntry(serverEntry, ETrue);
+			iFreePoolInstance->ReleaseEntryL(serverEntry, ETrue);
 			}		
 		return KErrNone;	
 		}
@@ -3670,7 +3670,7 @@
 	// we need to release the entry explicitly.
 	if(releaseEntry)
 		{
-		iFreePoolInstance->ReleaseEntry(entry, ETrue);
+		iFreePoolInstance->ReleaseEntryL(entry, ETrue);
 		User::LeaveIfError(err);
 		}
 	else
@@ -3703,7 +3703,7 @@
 		);
 	if(releaseEntry)
 		{
-		iFreePoolInstance->ReleaseEntry(entry, ETrue);
+		iFreePoolInstance->ReleaseEntryL(entry, ETrue);
 		}
 	User::LeaveIfError(err);
 	CleanupStack::PopAndDestroy(); //children
@@ -3757,7 +3757,7 @@
     TMsvId parentId = entry->Entry().Parent();
     if(releaseEntry)
         {
-        iFreePoolInstance->ReleaseEntry(entry, ETrue);
+        iFreePoolInstance->ReleaseEntryL(entry, ETrue);
         }
 
     // Find the parent in the cache - we may need to update its owner status flag both in cache and DB.
@@ -3768,7 +3768,7 @@
         updateTheParent = EFalse;
         if(releaseEntry)
             {
-            iFreePoolInstance->ReleaseEntry(entry, ETrue);
+            iFreePoolInstance->ReleaseEntryL(entry, ETrue);
             }
         }
     else
diff -r b66b8f3a7fd8 -r e7635922c074 messagingfw/msgsrvnstore/server/src/msvpreferreddrivelist.cpp
--- a/messagingfw/msgsrvnstore/server/src/msvpreferreddrivelist.cpp	Wed Jul 21 02:03:54 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/src/msvpreferreddrivelist.cpp	Tue Aug 03 21:08:41 2010 +0530
@@ -1,6 +1,6 @@
 // MSVPREFERREDDRIVELIST.CPP
 
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -278,7 +278,7 @@
 	for(TInt index = 0; index < count; ++index)
 		{		
 		RBuf8 text;
-		text.Create(100);
+		text.CreateL(100);
 		text.Append(KLtBracket);
 		text.AppendNum(index);
 		text.Append(KRtBracket);
diff -r b66b8f3a7fd8 -r e7635922c074 messagingfw/msgsrvnstore/server/src/msvsearchsortcacheentry.cpp
--- a/messagingfw/msgsrvnstore/server/src/msvsearchsortcacheentry.cpp	Wed Jul 21 02:03:54 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/src/msvsearchsortcacheentry.cpp	Tue Aug 03 21:08:41 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -118,7 +118,7 @@
 		iQueryData.iMessagePart = aQuery->iQueryTable[qCount].iMessagePart;
 		iQueryData.iRelationOp = aQuery->iQueryTable[qCount].iRelationOp;
 		iQueryData.iQueryString.Copy(aQuery->iQueryTable[qCount].iQueryString);
-		iMsgQuery.Append(iQueryData);	 
+		iMsgQuery.AppendL(iQueryData);	 
 		}
 	
 		CMSvSearchSortCacheManager::Instance()->GenerateQueryId(*this);
diff -r b66b8f3a7fd8 -r e7635922c074 messagingfw/msgsrvnstore/server/src/msvsearchsortcachemanager.cpp
--- a/messagingfw/msgsrvnstore/server/src/msvsearchsortcachemanager.cpp	Wed Jul 21 02:03:54 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/src/msvsearchsortcachemanager.cpp	Tue Aug 03 21:08:41 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -1020,12 +1020,12 @@
 				{
 				for(TInt ii =0; ii<iSearchSortDeltaCache->iNewEntry.Count(); ii++ )
 					{
-					iDeltaCacheIdArray.Append(iSearchSortDeltaCache->iNewEntry[ii]);
+					iDeltaCacheIdArray.AppendL(iSearchSortDeltaCache->iNewEntry[ii]);
 					}
 			
 				for(TInt ii =0; ii<iSearchSortDeltaCache->iUpdateEntry.Count(); ii++ )
 					{
-					iDeltaCacheIdArray.Append(iSearchSortDeltaCache->iUpdateEntry[ii]);
+					iDeltaCacheIdArray.AppendL(iSearchSortDeltaCache->iUpdateEntry[ii]);
 					}
 				iReturnResultType = KPartialResult;
 				iProgress = KMsvSearchSortOpInProgress;  
diff -r b66b8f3a7fd8 -r e7635922c074 messagingfw/msgsrvnstore/server/src/msvsearchsortdbwrapper.cpp
--- a/messagingfw/msgsrvnstore/server/src/msvsearchsortdbwrapper.cpp	Wed Jul 21 02:03:54 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/src/msvsearchsortdbwrapper.cpp	Tue Aug 03 21:08:41 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -271,7 +271,7 @@
 		
 		RBuf8 queryString;
 		queryString.CleanupClosePushL();
-		queryString.Create(KMaxQuerySize);
+		queryString.CreateL(KMaxQuerySize);
 		
 		//Folderlist for subfolder search
 		RArray<TMsvId> folderIdList;
@@ -282,7 +282,7 @@
 		parentId = aQuery.iParentId;
 	#endif  
 		//Append the parentid on which the search/sort is intiated into the folder list
-		folderIdList.Append(parentId);
+		folderIdList.AppendL(parentId);
 		
 		iSortOnHeader = aSortOnHeader;
 #if (defined SYMBIAN_MESSAGESTORE_HEADER_BODY_USING_SQLDB)	
diff -r b66b8f3a7fd8 -r e7635922c074 messagingfw/msgsrvnstore/server/src/msvsearchsortdeltacache.cpp
--- a/messagingfw/msgsrvnstore/server/src/msvsearchsortdeltacache.cpp	Wed Jul 21 02:03:54 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/src/msvsearchsortdeltacache.cpp	Tue Aug 03 21:08:41 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -108,7 +108,7 @@
 	{
 	if(aType == ENewMsg ) //New Msg Entry
 		{
-		iMsvSearchSortDeltaCache->iNewEntry.Append(aID);
+		iMsvSearchSortDeltaCache->iNewEntry.AppendL(aID);
 		iMsvSearchSortDeltaCache->iDeltaCacheDirtyFlag = ETrue;
 		}
 	// This conditional statement is required to check if any msg updation is going  on while doing search or not.
@@ -121,14 +121,14 @@
 			if( foundPos < 0 &&
 				iUpdateEntry.Find(aID) == KErrNotFound )
 				{
-				iMsvSearchSortDeltaCache->iUpdateEntry.Append(aID);
+				iMsvSearchSortDeltaCache->iUpdateEntry.AppendL(aID);
 				iMsvSearchSortDeltaCache->iDeltaCacheDirtyFlag = ETrue;
 				}
 							
 			}
 	else if(aType == EDeletedMsg) //Deleted msg Entry.
 		{
-		iMsvSearchSortDeltaCache->iDeleteEntry.Append(aID);
+		iMsvSearchSortDeltaCache->iDeleteEntry.AppendL(aID);
 		iMsvSearchSortDeltaCache->iDeltaCacheDirtyFlag = ETrue;
 		}
 	}
diff -r b66b8f3a7fd8 -r e7635922c074 messagingfw/msgsrvnstore/server/src/msvsearchsortoponheaderbody.cpp
--- a/messagingfw/msgsrvnstore/server/src/msvsearchsortoponheaderbody.cpp	Wed Jul 21 02:03:54 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/src/msvsearchsortoponheaderbody.cpp	Tue Aug 03 21:08:41 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -104,7 +104,7 @@
 	
 	for (TInt count = 0; count < aIdArray.Count(); ++count)
 		{
-		iIdArray.Append(aIdArray[count]);	
+		iIdArray.AppendL(aIdArray[count]);	
 		}
 	//set initial partList list flags
 	InitializePartList();
@@ -214,7 +214,7 @@
 		{
 		if(iRequestType == EMsvGetEntryForIds)
 			{
-			iEntryArray.Append(iEntry);
+			iEntryArray.AppendL(iEntry);
 			}
 		CompleteSelf();
 		// set the user request to KRequestPending
diff -r b66b8f3a7fd8 -r e7635922c074 messagingfw/msgsrvnstore/server/test/Unittef/src/t_msv_cache_indextableentry_step.cpp
--- a/messagingfw/msgsrvnstore/server/test/Unittef/src/t_msv_cache_indextableentry_step.cpp	Wed Jul 21 02:03:54 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/test/Unittef/src/t_msv_cache_indextableentry_step.cpp	Tue Aug 03 21:08:41 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -417,7 +417,7 @@
 	MY_ASSERT_EQUALS(iIndexTableEntry->Size(), aCount);
 	for(index = aCount; index < bulkCount; ++index) //manually release remaining entries
 		{
-		CMsvEntryFreePool::Instance()->ReleaseEntry(entries[index]);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(entries[index]);
 		}
 	
 	//---aCount > aEntries.Count()
@@ -478,8 +478,8 @@
 		MY_ASSERT_TRUE(iIndexTableEntry->EntryExists(entries[index]->GetId()));
 		}
 	MY_ASSERT_EQUALS(iIndexTableEntry->Size(), aCount);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(entries[0]);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(entries[4]);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(entries[0]);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(entries[4]);
 		
 	//---out of bounds index
 	iIndexTableEntry->ReleaseBlock(ETrue);
@@ -511,7 +511,7 @@
 	MY_ASSERT_EQUALS(iIndexTableEntry->Size(), 0);
 	for(index = 0; index < bulkCount; ++index)
 		{
-		CMsvEntryFreePool::Instance()->ReleaseEntry(entries[index]);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(entries[index]);
 		}
 		
 
@@ -908,7 +908,7 @@
 	oEntries.Reset();
 	TRAP_IGNORE(iIndexTableEntry->GetChildrenL(parent->GetId(), oEntries));
 	MY_ASSERT_EQUALS(oEntries.Count(), 11); //entryA + 10 others
-	CMsvEntryFreePool::Instance()->ReleaseEntry(nonimmediateParent);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(nonimmediateParent);
 	
 	
 	// t4. only grandchildren are present in the block
@@ -949,8 +949,8 @@
 	MY_ASSERT_EQUALS(err, KErrNone);
 	MY_ASSERT_EQUALS(oEntries.Count(), 0);
 	
-	CMsvEntryFreePool::Instance()->ReleaseEntry(nonimmediateParent);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(parent);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(nonimmediateParent);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(parent);
 	oEntries.Close();
 	tmsvEntries.Close();
 	entries.Close();	
@@ -1044,9 +1044,9 @@
  	TRAP(err, iIndexTableEntry->DeleteEntryL(entryA->GetId(), parentId));
  	MY_ASSERT_EQUALS(err, KErrNotFound);
  	
- 	CMsvEntryFreePool::Instance()->ReleaseEntry(parent);
- 	CMsvEntryFreePool::Instance()->ReleaseEntry(entryA);
- 	CMsvEntryFreePool::Instance()->ReleaseEntry(entryB);
+ 	CMsvEntryFreePool::Instance()->ReleaseEntryL(parent);
+ 	CMsvEntryFreePool::Instance()->ReleaseEntryL(entryA);
+ 	CMsvEntryFreePool::Instance()->ReleaseEntryL(entryB);
  	
  	
  	// t6. bulk additions and deletions
@@ -1084,7 +1084,7 @@
 		}
 	MY_ASSERT_TRUE(iIndexTableEntry->BlockPtr() == NULL);
 	
-	CMsvEntryFreePool::Instance()->ReleaseEntry(parent);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(parent);
 	tmsvEntries.Close();
 	entries.Close();
 	}
@@ -1142,7 +1142,7 @@
 	err = oEntries[0]->GetId() - oEntries[1]->GetId(); //successive entries
 	MY_ASSERT_TRUE(err < 0);
 	
-	CMsvEntryFreePool::Instance()->ReleaseEntry(parent);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(parent);
 	oEntries.Close();
 	}
 
diff -r b66b8f3a7fd8 -r e7635922c074 messagingfw/msgsrvnstore/server/test/Unittef/src/t_msv_dbadapter_step.cpp
--- a/messagingfw/msgsrvnstore/server/test/Unittef/src/t_msv_dbadapter_step.cpp	Wed Jul 21 02:03:54 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/test/Unittef/src/t_msv_dbadapter_step.cpp	Tue Aug 03 21:08:41 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -786,7 +786,7 @@
 	MY_ASSERT_EQUALS(err, KErrNone);
 	MY_ASSERT_EQUALS(visibleFolder, KMsvGlobalInBoxIndexEntryId);
 
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cacheEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cacheEntry);
 	visibleFolder = NULL;
 #if (defined SYMBIAN_MSGS_ENHANCED_REMOVABLE_MEDIA_SUPPORT)
 	TRAP(err, iMsvDbAdaptor->GetEntryL((driveId<<28)|KFirstFreeEntryId, cacheEntry, visibleFolder));
@@ -836,7 +836,7 @@
 	TRAP(err, iMsvDbAdaptor->UpdateEntryL(cacheEntry->Entry(), visibleFolder)); //parent not changed
 	MY_ASSERT_EQUALS(err, KErrNone);
 	
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cacheEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cacheEntry);
 	visibleFolder = NULL;
 #if (defined SYMBIAN_MSGS_ENHANCED_REMOVABLE_MEDIA_SUPPORT)
 	TRAP(err, iMsvDbAdaptor->GetEntryL((driveId<<28)|KFirstFreeEntryId, cacheEntry, visibleFolder));
@@ -864,7 +864,7 @@
 	MY_ASSERT_EQUALS(entry->iMtmData2, (long) 120);
 	MY_ASSERT_EQUALS(entry->iMtmData3, (long) 120);
 	
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cacheEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cacheEntry);
 	
 #if (defined SYMBIAN_MSGS_ENHANCED_REMOVABLE_MEDIA_SUPPORT)
 	// 3. Test update on an entry in an attached database.
@@ -921,7 +921,7 @@
 	MY_ASSERT_EQUALS(err, KErrNone);
 	MY_ASSERT_EQUALS(visibleFolder, KMsvGlobalInBoxIndexEntryId);
 
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cacheEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cacheEntry);
 	visibleFolder = NULL;
 	TRAP(err, iMsvDbAdaptor->GetEntryL((driveId<<28)|KFirstFreeEntryId, cacheEntry, visibleFolder));
 	MY_ASSERT_EQUALS(err, KErrNone);
@@ -962,7 +962,7 @@
 	TRAP(err, iMsvDbAdaptor->UpdateEntryL(cacheEntry->Entry(), visibleFolder)); //parent not changed
 	MY_ASSERT_EQUALS(err, KErrNone);
 	
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cacheEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cacheEntry);
 	visibleFolder = NULL;
 	TRAP(err, iMsvDbAdaptor->GetEntryL((driveId<<28)|KFirstFreeEntryId, cacheEntry, visibleFolder));
 	MY_ASSERT_EQUALS(err, KErrNone);
@@ -982,7 +982,7 @@
 	MY_ASSERT_EQUALS(entry->iMtmData2, (long) 120);
 	MY_ASSERT_EQUALS(entry->iMtmData3, (long) 120);
 	
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cacheEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cacheEntry);
 #endif	
 	}
 
@@ -1067,32 +1067,32 @@
 
 	delete data;
 	data = NULL;
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cacheEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cacheEntry);
 	
 	//TRAP(err, iMsvDbAdaptor->GetEntryL(KMsvLocalServiceIndexEntryId, entry, visibleFolder));
 	TRAP(err, iMsvDbAdaptor->GetEntryL(KMsvLocalServiceIndexEntryId, cacheEntry, visibleFolder));
 	MY_ASSERT_EQUALS(err, KErrNone);
 	MY_ASSERT_EQUALS(visibleFolder, KMsvRootIndexEntryId);
 	MY_ASSERT_EQUALS(cacheEntry->Entry().iType, KUidMsvServiceEntry);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cacheEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cacheEntry);
 	
 	TRAP(err, iMsvDbAdaptor->GetEntryL(KMsvGlobalInBoxIndexEntryId, cacheEntry, visibleFolder));
 	MY_ASSERT_EQUALS(err, KErrNone);
 	MY_ASSERT_EQUALS(visibleFolder, KMsvRootIndexEntryId);
 	MY_ASSERT_EQUALS(cacheEntry->Entry().iType, KUidMsvFolderEntry);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cacheEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cacheEntry);
 	
 	TRAP(err, iMsvDbAdaptor->GetEntryL(KFirstFreeEntryId+1, cacheEntry, visibleFolder));
 	MY_ASSERT_EQUALS(err, KErrNone);
 	MY_ASSERT_EQUALS(visibleFolder, KMsvRootIndexEntryId);
 	MY_ASSERT_EQUALS(cacheEntry->Entry().iType, KUidMsvMessageEntry);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cacheEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cacheEntry);
 	
 	TRAP(err, iMsvDbAdaptor->GetEntryL(KFirstFreeEntryId+2, cacheEntry, visibleFolder));
 	MY_ASSERT_EQUALS(err, KErrNone);
 	MY_ASSERT_EQUALS(visibleFolder, KMsvRootIndexEntryId);
 	MY_ASSERT_EQUALS(cacheEntry->Entry().iType, KUidMsvAttachmentEntry);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cacheEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cacheEntry);
 	
 #if (defined SYMBIAN_MSGS_ENHANCED_REMOVABLE_MEDIA_SUPPORT)
 	TInt driveId = (1<<28);
@@ -1103,37 +1103,37 @@
 	MY_ASSERT_EQUALS(err, KErrNone);
 	MY_ASSERT_EQUALS(visibleFolder, KMsvGlobalInBoxIndexEntryId);
 	MY_ASSERT_EQUALS(cacheEntry->Entry().iType, KUidMsvMessageEntry);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cacheEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cacheEntry);
 	
 	TRAP(err, iMsvDbAdaptor->GetEntryL(KFirstFreeEntryId+100, cacheEntry, visibleFolder));
 	MY_ASSERT_EQUALS(err, KErrNone);
 	MY_ASSERT_EQUALS(visibleFolder, KMsvGlobalInBoxIndexEntryId);
 	MY_ASSERT_EQUALS(cacheEntry->Entry().iType, KUidMsvMessageEntry);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cacheEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cacheEntry);
 	
 	TRAP(err, iMsvDbAdaptor->GetEntryL(KFirstFreeEntryId+102, cacheEntry, visibleFolder));
 	MY_ASSERT_EQUALS(err, KErrNone);
 	MY_ASSERT_EQUALS(visibleFolder, KMsvGlobalInBoxIndexEntryId);
 	MY_ASSERT_EQUALS(cacheEntry->Entry().iType, KUidMsvMessageEntry);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cacheEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cacheEntry);
 	
 	TRAP(err, iMsvDbAdaptor->GetEntryL(KFirstFreeEntryId+103, cacheEntry, visibleFolder));
 	MY_ASSERT_EQUALS(err, KErrNone);
 	MY_ASSERT_EQUALS(visibleFolder, KMsvRootIndexEntryId);
 	MY_ASSERT_EQUALS(cacheEntry->Entry().iType, KUidMsvMessageEntry);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cacheEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cacheEntry);
 	
 	TRAP(err, iMsvDbAdaptor->GetEntryL(KFirstFreeEntryId+201, cacheEntry, visibleFolder));
 	MY_ASSERT_EQUALS(err, KErrNone);
 	MY_ASSERT_EQUALS(visibleFolder, KMsvRootIndexEntryId);
 	MY_ASSERT_EQUALS(cacheEntry->Entry().iType, KUidMsvMessageEntry);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cacheEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cacheEntry);
 	
 	TRAP(err, iMsvDbAdaptor->GetEntryL(KFirstFreeEntryId+202, cacheEntry, visibleFolder));
 	MY_ASSERT_EQUALS(err, KErrNone);
 	MY_ASSERT_EQUALS(visibleFolder, KMsvRootIndexEntryId);
 	MY_ASSERT_EQUALS(cacheEntry->Entry().iType, KUidMsvMessageEntry);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cacheEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cacheEntry);
 	
 	TRAP(err, iMsvDbAdaptor->GetEntryL(KFirstFreeEntryId+203, cacheEntry, visibleFolder));
 	MY_ASSERT_EQUALS(err, KErrNotFound);
@@ -1178,19 +1178,19 @@
 	MY_ASSERT_EQUALS(err, KErrNone);
 	MY_ASSERT_EQUALS(visibleFolder, KMsvGlobalInBoxIndexEntryId);
 	MY_ASSERT_EQUALS(cacheEntry->Entry().iType, KUidMsvMessageEntry);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cacheEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cacheEntry);
 	
 	TRAP(err, iMsvDbAdaptor->GetEntryL((driveId<<28)|KFirstFreeEntryId+50, cacheEntry, visibleFolder));
 	MY_ASSERT_EQUALS(err, KErrNone);
 	MY_ASSERT_EQUALS(visibleFolder, KMsvGlobalInBoxIndexEntryId);
 	MY_ASSERT_EQUALS(cacheEntry->Entry().iType, KUidMsvMessageEntry);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cacheEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cacheEntry);
 	
 	TRAP(err, iMsvDbAdaptor->GetEntryL((driveId<<28)|KFirstFreeEntryId+102, cacheEntry, visibleFolder));
 	MY_ASSERT_EQUALS(err, KErrNone);
 	MY_ASSERT_EQUALS(visibleFolder, KMsvGlobalInBoxIndexEntryId);
 	MY_ASSERT_EQUALS(cacheEntry->Entry().iType, KUidMsvMessageEntry);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cacheEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cacheEntry);
 	
 	//A negative test on a non-existent entry.
 	TRAP(err, iMsvDbAdaptor->GetEntryL((driveId<<28)|KFirstFreeEntryId+103, cacheEntry, visibleFolder));
@@ -1202,13 +1202,13 @@
 	MY_ASSERT_EQUALS(err, KErrNone);
 	MY_ASSERT_EQUALS(visibleFolder, KMsvGlobalInBoxIndexEntryId);
 	MY_ASSERT_EQUALS(cacheEntry->Entry().iType, KUidMsvMessageEntry);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cacheEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cacheEntry);
 	
 	TRAP(err, iMsvDbAdaptor->GetEntryL(KFirstFreeEntryId+200, cacheEntry, visibleFolder));
 	MY_ASSERT_EQUALS(err, KErrNone);
 	MY_ASSERT_EQUALS(visibleFolder, KMsvRootIndexEntryId);
 	MY_ASSERT_EQUALS(cacheEntry->Entry().iType, KUidMsvMessageEntry);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cacheEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cacheEntry);
 #endif	
 	}
 
@@ -1218,7 +1218,7 @@
 	{
 	for(int index=0; index<childArray.Count(); index++)
 		{
-		CMsvEntryFreePool::Instance()->ReleaseEntry(childArray[index]);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(childArray[index]);
 		}
 	childArray.Reset();
 	}
@@ -1685,19 +1685,19 @@
 	CMsvCacheEntry* parentEntry = NULL;
 	TRAP_IGNORE(iMsvDbAdaptor->GetEntryL(KMsvGlobalInBoxIndexEntryId, parentEntry, visibleFolderId));
 	TRAP_IGNORE(iMsvDbAdaptor->UpdateOwnerStatusL(KMsvGlobalInBoxIndexEntryId, parentEntry->Entry(), ETrue));
-	CMsvEntryFreePool::Instance()->ReleaseEntry(parentEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(parentEntry);
 	TRAP(err, iMsvDbAdaptor->GetEntryL(KMsvGlobalInBoxIndexEntryId, parentEntry, visibleFolderId));
 	MY_ASSERT_EQUALS(err, KErrNone);
 	MY_ASSERT_TRUE(parentEntry->Entry().Owner());
-	CMsvEntryFreePool::Instance()->ReleaseEntry(parentEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(parentEntry);
 	
 	//3. Test resetting of the flag
 	TRAP_IGNORE(iMsvDbAdaptor->GetEntryL(KMsvGlobalInBoxIndexEntryId, parentEntry, visibleFolderId));
 	TRAP_IGNORE(iMsvDbAdaptor->UpdateOwnerStatusL(KMsvGlobalInBoxIndexEntryId, parentEntry->Entry(), EFalse));
-	CMsvEntryFreePool::Instance()->ReleaseEntry(parentEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(parentEntry);
 	TRAP_IGNORE(iMsvDbAdaptor->GetEntryL(KMsvGlobalInBoxIndexEntryId, parentEntry, visibleFolderId));
 	MY_ASSERT_FALSE(parentEntry->Entry().Owner());
-	CMsvEntryFreePool::Instance()->ReleaseEntry(parentEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(parentEntry);
 	
 #if (defined SYMBIAN_MSGS_ENHANCED_REMOVABLE_MEDIA_SUPPORT)
 	// 4. Create and attach a second database. Create entries in it and test.
@@ -1725,32 +1725,32 @@
 	parentEntry = NULL;
 	TRAP_IGNORE(iMsvDbAdaptor->GetEntryL((driveId<<28)|KMsvGlobalInBoxIndexEntryId, parentEntry, visibleFolderId));
 	TRAP_IGNORE(iMsvDbAdaptor->UpdateOwnerStatusL((driveId<<28)|KMsvGlobalInBoxIndexEntryId, parentEntry->Entry(), ETrue));
-	CMsvEntryFreePool::Instance()->ReleaseEntry(parentEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(parentEntry);
 	TRAP_IGNORE(iMsvDbAdaptor->GetEntryL((driveId<<28)|KMsvGlobalInBoxIndexEntryId, parentEntry, visibleFolderId));
 	MY_ASSERT_TRUE(parentEntry->Entry().Owner());
-	CMsvEntryFreePool::Instance()->ReleaseEntry(parentEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(parentEntry);
 	//Flag already set, attempt to set again.
 	parentEntry = NULL;
 	TRAP_IGNORE(iMsvDbAdaptor->GetEntryL((driveId<<28)|KMsvGlobalInBoxIndexEntryId, parentEntry, visibleFolderId));
 	TRAP_IGNORE(iMsvDbAdaptor->UpdateOwnerStatusL((driveId<<28)|KMsvGlobalInBoxIndexEntryId, parentEntry->Entry(), ETrue));
-	CMsvEntryFreePool::Instance()->ReleaseEntry(parentEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(parentEntry);
 	TRAP_IGNORE(iMsvDbAdaptor->GetEntryL((driveId<<28)|KMsvGlobalInBoxIndexEntryId, parentEntry, visibleFolderId));
 	MY_ASSERT_TRUE(parentEntry->Entry().Owner());
-	CMsvEntryFreePool::Instance()->ReleaseEntry(parentEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(parentEntry);
 	//Resetting of the flag.
 	TRAP_IGNORE(iMsvDbAdaptor->GetEntryL((driveId<<28)|KMsvGlobalInBoxIndexEntryId, parentEntry, visibleFolderId));
 	TRAP_IGNORE(iMsvDbAdaptor->UpdateOwnerStatusL((driveId<<28)|KMsvGlobalInBoxIndexEntryId, parentEntry->Entry(), EFalse));
-	CMsvEntryFreePool::Instance()->ReleaseEntry(parentEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(parentEntry);
 	TRAP_IGNORE(iMsvDbAdaptor->GetEntryL((driveId<<28)|KMsvGlobalInBoxIndexEntryId, parentEntry, visibleFolderId));
 	MY_ASSERT_FALSE(parentEntry->Entry().Owner());
-	CMsvEntryFreePool::Instance()->ReleaseEntry(parentEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(parentEntry);
 	//Flag already reset, attempt to reset again.
 	TRAP_IGNORE(iMsvDbAdaptor->GetEntryL((driveId<<28)|KMsvGlobalInBoxIndexEntryId, parentEntry, visibleFolderId));
 	TRAP_IGNORE(iMsvDbAdaptor->UpdateOwnerStatusL((driveId<<28)|KMsvGlobalInBoxIndexEntryId, parentEntry->Entry(), EFalse));
-	CMsvEntryFreePool::Instance()->ReleaseEntry(parentEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(parentEntry);
 	TRAP_IGNORE(iMsvDbAdaptor->GetEntryL((driveId<<28)|KMsvGlobalInBoxIndexEntryId, parentEntry, visibleFolderId));
 	MY_ASSERT_FALSE(parentEntry->Entry().Owner());
-	CMsvEntryFreePool::Instance()->ReleaseEntry(parentEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(parentEntry);
 #endif	
 	}
 
@@ -2366,7 +2366,7 @@
 	// (j) Close the database without performing rollback/commit.
 	delete iMsvDbAdaptor;
 	iMsvDbAdaptor = NULL;
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cacheEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cacheEntry);
 	// (k) Create the DBAdapter again.
 	TRAP_IGNORE(iMsvDbAdaptor = CMsvDBAdapter::NewL());
 	TInt sysDrive = (TInt)RFs::GetSystemDrive();
@@ -2378,7 +2378,7 @@
 	TRAP(err, iMsvDbAdaptor->GetEntryL((driveId<<28)|KFirstFreeEntryId, cacheEntry, visibleFolder));
 	MY_ASSERT_EQUALS(err, KErrNone);
 	MY_ASSERT_EQUALS(cacheEntry->Entry().Parent(), KMsvRootIndexEntryId); //old parent
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cacheEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cacheEntry);
 	
 	
 	// 2. Create an entry and rollback.
diff -r b66b8f3a7fd8 -r e7635922c074 messagingfw/msgsrvnstore/server/test/Unittef/src/t_msv_indexadapter_step.cpp
--- a/messagingfw/msgsrvnstore/server/test/Unittef/src/t_msv_indexadapter_step.cpp	Wed Jul 21 02:03:54 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/test/Unittef/src/t_msv_indexadapter_step.cpp	Tue Aug 03 21:08:41 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -342,7 +342,7 @@
 		TRAP_IGNORE(dbPtr->GetEntryL(newId+index, cEntry, visibleParentId));
 		MY_ASSERT_EQUALS((long)index, cEntry->Entry().MtmData1());
 		MY_ASSERT_EQUALS(KUidMsvMessageEntry, cEntry->Entry().iType);
-		CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 		
 		iIndexAdapter->FindEntryInCache(newId+index, cEntry);
 		MY_ASSERT_EQUALS((long)index, cEntry->Entry().MtmData1());
@@ -357,7 +357,7 @@
 		TRAP_IGNORE(dbPtr->GetEntryL(newId+index, cEntry, visibleParentId));
 		MY_ASSERT_EQUALS((long)index, cEntry->Entry().MtmData1());
 		MY_ASSERT_EQUALS(KUidMsvMessageEntry, cEntry->Entry().iType);
-		CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 		
 		iIndexAdapter->FindEntryInCache(newId+index, cEntry);
 		MY_ASSERT_EQUALS((long)index, cEntry->Entry().MtmData1());
@@ -393,7 +393,7 @@
 		TRAP_IGNORE(dbPtr->GetEntryL(newId+index, cEntry, visibleParentId));
 		MY_ASSERT_EQUALS((long)(index+200), cEntry->Entry().MtmData2());
 		MY_ASSERT_EQUALS(KUidMsvAttachmentEntry, cEntry->Entry().iType);
-		CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 		
 		iIndexAdapter->FindEntryInCache(newId+index, cEntry);
 		MY_ASSERT_EQUALS((long)(index+200), cEntry->Entry().MtmData2());
@@ -413,7 +413,7 @@
 		TRAP_IGNORE(dbPtr->GetEntryL(newId+index, cEntry, visibleParentId));
 		MY_ASSERT_EQUALS((long)index, cEntry->Entry().MtmData2());
 		MY_ASSERT_EQUALS(KUidMsvFolderEntry, cEntry->Entry().iType);
-		CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 		
 		iIndexAdapter->FindEntryInCache(newId+index, cEntry);
 		MY_ASSERT_EQUALS((long)index, cEntry->Entry().MtmData2());
@@ -468,7 +468,7 @@
 		MY_ASSERT_EQUALS(KUidMsvAttachmentEntry, cEntry->Entry().iType);
 		MY_ASSERT_EQUALS((long)(newId+1500), cEntry->Entry().Parent());
 		MY_ASSERT_EQUALS((long)(newId+1500), visibleParentId);
-		CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 		// Check entry in cache.
 		MY_ASSERT_TRUE(TestFolder->GetEntry(newId+index, cEntry));
 		MY_ASSERT_EQUALS(KUidMsvFolderEntry, cEntry->Entry().iType);
@@ -491,7 +491,7 @@
 		MY_ASSERT_EQUALS(KUidMsvAttachmentEntry, cEntry->Entry().iType);
 		MY_ASSERT_EQUALS(newId+1500, cEntry->Entry().Parent());
 		MY_ASSERT_EQUALS(newId+1500, visibleParentId);
-		CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 		// Check entry in cache.
 		MY_ASSERT_FALSE(TestFolder->GetEntry(newId+index, cEntry));
 		MY_ASSERT_TRUE(NewTestFolder->GetEntry(newId+index, cEntry));
@@ -543,7 +543,7 @@
 		MY_ASSERT_EQUALS(KUidMsvFolderEntry, cEntry->Entry().iType);
 		MY_ASSERT_EQUALS((long)(KMsvLocalServiceIndexEntryId), cEntry->Entry().Parent());
 		MY_ASSERT_EQUALS((long)KMsvLocalServiceIndexEntryId, visibleParentId);
-		CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 		// Check entry in cache.
 		MY_ASSERT_TRUE(TestFolder->GetEntry(newId+index, cEntry));
 		MY_ASSERT_EQUALS(KUidMsvAttachmentEntry, cEntry->Entry().iType);
@@ -570,7 +570,7 @@
 		MY_ASSERT_EQUALS(KUidMsvAttachmentEntry, cEntry->Entry().iType);
 		MY_ASSERT_EQUALS(newId+1500, cEntry->Entry().Parent());
 		MY_ASSERT_EQUALS(newId+1500, visibleParentId);
-		CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 		// Check entry in cache.
 		MY_ASSERT_TRUE(TestFolder->GetEntry(newId+index, cEntry));
 		MY_ASSERT_EQUALS(KUidMsvAttachmentEntry, cEntry->Entry().iType);
@@ -662,7 +662,7 @@
 		TRAP_IGNORE(dbPtr->GetEntryL(newId+index, cEntry, visibleParentId));
 		MY_ASSERT_EQUALS((long)(newId+2200), cEntry->Entry().Parent());
 		MY_ASSERT_EQUALS((long)KMsvLocalServiceIndexEntryId, visibleParentId);
-		CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 		// Check entry in cache.
 		if(index < 2006)
 			{
@@ -705,7 +705,7 @@
 		TRAP_IGNORE(dbPtr->GetEntryL(newId+index, cEntry, visibleParentId));
 		MY_ASSERT_EQUALS(newId+2200, cEntry->Entry().Parent());
 		MY_ASSERT_EQUALS((long)KMsvLocalServiceIndexEntryId, visibleParentId);
-		CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 		// Check entry in cache.
 		MY_ASSERT_FALSE(TestFolder->GetEntry(newId+index, cEntry));
 		MY_ASSERT_TRUE(NewTestFolder->GetEntry(newId+index, cEntry));
@@ -759,11 +759,11 @@
 		{
 		TRAP_IGNORE(dbPtr->GetEntryL(newId+index+5200, cEntry, visibleParentId));
 		ASSERT_EQUALS(visibleParentId, newId+5000);
-		CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 		}
 	TRAP_IGNORE(dbPtr->GetEntryL(newId+5100, cEntry, visibleParentId));
 	MY_ASSERT_EQUALS(visibleParentId, newId+5000);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 	
 	//12. Scenario: Local Service has 2 children, newId+6000 and newId+6100.
 	//				newId+6000 is visible and the other is not visible.
@@ -807,15 +807,15 @@
 	dbPtr = iIndexAdapter->GetDbAdapter();
 	TRAP_IGNORE(dbPtr->GetEntryL(newId+6100, cEntry, visibleParentId));
 	MY_ASSERT_EQUALS(visibleParentId, newId+6000);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 	
 	TRAP_IGNORE(dbPtr->GetEntryL(newId+6200, cEntry, visibleParentId));
 	MY_ASSERT_EQUALS(visibleParentId, newId+6000);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 	
 	//TRAP_IGNORE(dbPtr->GetEntryL(newId+6300, cEntry, visibleParentId));
 	//MY_ASSERT_EQUALS(visibleParentId, newId+6200);
-	//CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+	//CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 	
 	//13. Moving a visible folder with children to under a non-visible folder which has
 	//	  a visible parent.
@@ -846,15 +846,15 @@
 	//	   appropriately set.
 	TRAP_IGNORE(dbPtr->GetEntryL(newId+7100, cEntry, visibleParentId));
 	MY_ASSERT_EQUALS(visibleParentId, KMsvRootIndexEntryId);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 	
 	TRAP_IGNORE(dbPtr->GetEntryL(newId+7200, cEntry, visibleParentId));
 	MY_ASSERT_EQUALS(visibleParentId, newId+7100);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 	
 	TRAP_IGNORE(dbPtr->GetEntryL(newId+7300, cEntry, visibleParentId));
 	MY_ASSERT_EQUALS(visibleParentId, newId+7200);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 	}
 	
 	
@@ -3302,10 +3302,10 @@
 
 	RArray<CMsvIndexAdapter::TNonCommittedChangedEntries>& entryList = iIndexAdapter->GetNonComittedChangedEntry();
 	MY_ASSERT_EQUALS(1, entryList.Count());
-	CMsvEntryFreePool::Instance()->ReleaseEntry(entryList[0].iBkpEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(entryList[0].iBkpEntry);
 	entryList.Reset();
 	
-	CMsvEntryFreePool::Instance()->ReleaseEntry(testentry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(testentry);
 	
 	//4. change Entry 
 	//a. Open Transaction
@@ -3370,7 +3370,7 @@
 	TRAP_IGNORE(iIndexAdapter->OpenclosedL(openFilename));
 	
 	MY_ASSERT_EQUALS(1, entryList.Count());
-	CMsvEntryFreePool::Instance()->ReleaseEntry(entryList[0].iBkpEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(entryList[0].iBkpEntry);
 	entryList.Reset();
 	
 	iIndexAdapter->GetEntry(KFirstFreeEntryId+200, entry2);
@@ -3431,7 +3431,7 @@
 	MY_ASSERT_TRUE(entry2->Visible());
 	MY_ASSERT_EQUALS(entry2->Id(), KFirstFreeEntryId+700);
 
-	CMsvEntryFreePool::Instance()->ReleaseEntry(testentry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(testentry);
 	
 	/* TEST Code added after changes in DOChangeEntry for rollback */
 	// 6. Modifying 10 entries using no-commit.
@@ -3462,7 +3462,7 @@
 		TRAP_IGNORE(dbPtr->GetEntryL(KFirstFreeEntryId+index, cEntry, visibleParentId));
 		MY_ASSERT_EQUALS((long)index, cEntry->Entry().MtmData1());
 		MY_ASSERT_EQUALS(KUidMsvMessageEntry, cEntry->Entry().iType);
-		CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 		
 		iIndexAdapter->FindEntryInCache(KFirstFreeEntryId+index, cEntry);
 		MY_ASSERT_EQUALS((long)index, cEntry->Entry().MtmData1());
@@ -3477,7 +3477,7 @@
 		TRAP_IGNORE(dbPtr->GetEntryL(KFirstFreeEntryId+index, cEntry, visibleParentId));
 		MY_ASSERT_EQUALS((long)index, cEntry->Entry().MtmData1());
 		MY_ASSERT_EQUALS(KUidMsvMessageEntry, cEntry->Entry().iType);
-		CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 		
 		iIndexAdapter->FindEntryInCache(KFirstFreeEntryId+index, cEntry);
 		MY_ASSERT_EQUALS((long)index, cEntry->Entry().MtmData1());
@@ -3513,7 +3513,7 @@
 		TRAP_IGNORE(dbPtr->GetEntryL(KFirstFreeEntryId+index, cEntry, visibleParentId));
 		MY_ASSERT_EQUALS((long)(index+200), cEntry->Entry().MtmData2());
 		MY_ASSERT_EQUALS(KUidMsvAttachmentEntry, cEntry->Entry().iType);
-		CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 		
 		iIndexAdapter->FindEntryInCache(KFirstFreeEntryId+index, cEntry);
 		MY_ASSERT_EQUALS((long)(index+200), cEntry->Entry().MtmData2());
@@ -3533,7 +3533,7 @@
 		TRAP_IGNORE(dbPtr->GetEntryL(KFirstFreeEntryId+index, cEntry, visibleParentId));
 		MY_ASSERT_EQUALS((long)index, cEntry->Entry().MtmData2());
 		MY_ASSERT_EQUALS(KUidMsvFolderEntry, cEntry->Entry().iType);
-		CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 		
 		iIndexAdapter->FindEntryInCache(KFirstFreeEntryId+index, cEntry);
 		MY_ASSERT_EQUALS((long)index, cEntry->Entry().MtmData2());
@@ -3589,7 +3589,7 @@
 		MY_ASSERT_EQUALS(KUidMsvAttachmentEntry, cEntry->Entry().iType);
 		MY_ASSERT_EQUALS((long)(KFirstFreeEntryId+1500), cEntry->Entry().Parent());
 		MY_ASSERT_EQUALS((long)(KFirstFreeEntryId+1500), visibleParentId);
-		CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 		// Check entry in cache.
 		MY_ASSERT_TRUE(TestFolder->GetEntry(KFirstFreeEntryId+index, cEntry));
 		MY_ASSERT_FALSE(KUidMsvAttachmentEntry==cEntry->Entry().iType);
@@ -3616,7 +3616,7 @@
 		MY_ASSERT_EQUALS(KUidMsvAttachmentEntry, cEntry->Entry().iType);
 		MY_ASSERT_EQUALS(KFirstFreeEntryId+1500, cEntry->Entry().Parent());
 		MY_ASSERT_EQUALS(KFirstFreeEntryId+1500, visibleParentId);
-		CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 		// Check entry in cache.
 		MY_ASSERT_FALSE(TestFolder->GetEntry(KFirstFreeEntryId+index, cEntry));
 		MY_ASSERT_TRUE(NewTestFolder->GetEntry(KFirstFreeEntryId+index, cEntry));
@@ -3669,7 +3669,7 @@
 		MY_ASSERT_EQUALS(KUidMsvFolderEntry, cEntry->Entry().iType);
 		MY_ASSERT_EQUALS((long)(KMsvGlobalInBoxIndexEntryId), cEntry->Entry().Parent());
 		MY_ASSERT_EQUALS((long)KMsvGlobalInBoxIndexEntryId, visibleParentId);
-		CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 		// Check entry in cache.
 		MY_ASSERT_TRUE(TestFolder->GetEntry(KFirstFreeEntryId+index, cEntry));
 		MY_ASSERT_FALSE(KUidMsvFolderEntry==cEntry->Entry().iType);
@@ -3701,7 +3701,7 @@
 		MY_ASSERT_EQUALS(KUidMsvAttachmentEntry, cEntry->Entry().iType);
 		MY_ASSERT_EQUALS(KFirstFreeEntryId+1500, cEntry->Entry().Parent());
 		MY_ASSERT_EQUALS(KFirstFreeEntryId+1500, visibleParentId);
-		CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 		// Check entry in cache.
 		MY_ASSERT_TRUE(TestFolder->GetEntry(KFirstFreeEntryId+index, cEntry));
 		MY_ASSERT_EQUALS(KUidMsvAttachmentEntry, cEntry->Entry().iType);
@@ -3794,7 +3794,7 @@
 		TRAP_IGNORE(dbPtr->GetEntryL(KFirstFreeEntryId+index, cEntry, visibleParentId));
 		MY_ASSERT_EQUALS((long)(KFirstFreeEntryId+2200), cEntry->Entry().Parent());
 		MY_ASSERT_EQUALS((long)KMsvRootIndexEntryIdValue, visibleParentId);
-		CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 		// Check entry in cache.
 		if(index < 2006)
 			{
@@ -3839,7 +3839,7 @@
 		TRAP_IGNORE(dbPtr->GetEntryL(KFirstFreeEntryId+index, cEntry, visibleParentId));
 		MY_ASSERT_EQUALS(KFirstFreeEntryId+2200, cEntry->Entry().Parent());
 		MY_ASSERT_EQUALS((long)KMsvRootIndexEntryIdValue, visibleParentId);
-		CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 		// Check entry in cache.
 		MY_ASSERT_FALSE(TestFolder->GetEntry(KFirstFreeEntryId+index, cEntry));
 		MY_ASSERT_TRUE(NewTestFolder->GetEntry(KFirstFreeEntryId+index, cEntry));
@@ -3893,11 +3893,11 @@
 		{
 		TRAP_IGNORE(dbPtr->GetEntryL(KFirstFreeEntryId+index+5200, cEntry, visibleParentId));
 		ASSERT_EQUALS(visibleParentId, KFirstFreeEntryId+5000);
-		CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+		CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 		}
 	TRAP_IGNORE(dbPtr->GetEntryL(KFirstFreeEntryId+5100, cEntry, visibleParentId));
 	MY_ASSERT_EQUALS(visibleParentId, KFirstFreeEntryId+5000);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 	
 	//12. Scenario: Root has 2 children, KFirstFreeEntryId+6000 and KFirstFreeEntryId+6100.
 	//				KFirstFreeEntryId+6000 is visible and the other is not visible.
@@ -3941,11 +3941,11 @@
 	dbPtr = iIndexAdapter->GetDbAdapter();
 	TRAP_IGNORE(dbPtr->GetEntryL(KFirstFreeEntryId+6100, cEntry, visibleParentId));
 	MY_ASSERT_EQUALS(visibleParentId, KFirstFreeEntryId+6000);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 	
 	TRAP_IGNORE(dbPtr->GetEntryL(KFirstFreeEntryId+6200, cEntry, visibleParentId));
 	MY_ASSERT_EQUALS(visibleParentId, KFirstFreeEntryId+6000);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 	
 	//13. Moving a visible folder with children to under a non-visible folder which has
 	//	  a visible parent.
@@ -3976,15 +3976,15 @@
 	//	   appropriately set.
 	TRAP_IGNORE(dbPtr->GetEntryL(KFirstFreeEntryId+7100, cEntry, visibleParentId));
 	MY_ASSERT_EQUALS(visibleParentId, KMsvRootIndexEntryId);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 	
 	TRAP_IGNORE(dbPtr->GetEntryL(KFirstFreeEntryId+7200, cEntry, visibleParentId));
 	MY_ASSERT_EQUALS(visibleParentId, KFirstFreeEntryId+7100);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);
 	
 	TRAP_IGNORE(dbPtr->GetEntryL(KFirstFreeEntryId+7300, cEntry, visibleParentId));
 	MY_ASSERT_EQUALS(visibleParentId, KFirstFreeEntryId+7200);
-	CMsvEntryFreePool::Instance()->ReleaseEntry(cEntry);	
+	CMsvEntryFreePool::Instance()->ReleaseEntryL(cEntry);	
 	}
 	
 
diff -r b66b8f3a7fd8 -r e7635922c074 messagingfw/sendas/server/src/csendassender.cpp
--- a/messagingfw/sendas/server/src/csendassender.cpp	Wed Jul 21 02:03:54 2010 +0530
+++ b/messagingfw/sendas/server/src/csendassender.cpp	Tue Aug 03 21:08:41 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -120,7 +120,7 @@
  	_LIT16(KComma, ",");
  		
  	RBuf16 buffer;
- 	buffer.Create(size+ rcptCount);
+ 	buffer.CreateL(size+ rcptCount);
  	CleanupClosePushL(buffer);
  	if(rcptCount > 0)
  		{