MCL/sf/mw/messagingmw: comparison messagingfw/msgsrvnstore/server/src/msvindexadapter.cpp

equal deleted inserted replaced

-:e5b3a2155e1a
+:d2c4c66342f3
-// 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"
 // which accompanies this distribution, and is available
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 {
 folderNode->iDlink.Deque();
 delete folderNode;
 }
-iFreePoolInstance->ReleaseEntry(iRootEntry);
+iFreePoolInstance->ReleaseEntryL(iRootEntry);
 iRootEntry = NULL;
 // 3. Delete internal data structure.
 iNonCommittedAddedEntryList.ResetAndDestroy();
 iNonCommittedChangedEntryList.Reset();
 #ifndef _NO_SERVER_LOGGING_
 	iServer.Log(_L("Cache initialized succesfully."));
 #endif
-	TMsvId tmpNextId = NULL;
+	TMsvId tmpNextId = 0;
 	iDbAdapter->GetMaxTMsvIdL(tmpNextId);
 	iNextCreateId = (tmpNextId >= KFirstFreeEntryId)? (tmpNextId+1) : KFirstFreeEntryId;
 	iIdle = CIdle::NewL(CActive::EPriorityIdle);
 	CompleteSelf();
 	CMsvCacheEntry* entry = NULL;
 	TBool releaseEntry = FindEntryL(aSelection.At(0), entry, EFalse);
 	TMsvId parentId = entry->Entry().Parent();
 	if(releaseEntry)
 		{
-		iFreePoolInstance->ReleaseEntry(entry, ETrue);
+		iFreePoolInstance->ReleaseEntryL(entry, ETrue);
 		}
 	CMsvEntrySelection* children = new(ELeave)CMsvEntrySelection;
 	CleanupStack::PushL(children);
 	for (TInt index=0; index<count; ++index)
 			}
 		);
 	// 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
 	}
 iFreePoolInstance->ReleaseEntryWithoutTransaction(bkpEntry);
 if(newVisibleFolderNode)
 newVisibleFolderNode->DeleteEntryL(oldEntry->GetId());
 User::Leave(err);
 }
-UpdateDates(*oldEntry, EFalse);
+	UpdateDates(*oldEntry, EFalse);
-if(aForcedUpdate || changedPrivateInfo && aOwnerId != KMsvServerId )
+	if(aForcedUpdate || changedPrivateInfo && aOwnerId != KMsvServerId )
 {
 oldEntry->SetEntryOwnerId(aOwnerId);
 }
 TRAP(err,
 bkpEntry,
 oldParentEntry,
 newParentEntry,
 descendentList,
 resetOldParentOwnerFlag);
-iNonCommittedChangedEntryList.Append(entryDetails);
+iNonCommittedChangedEntryList.AppendL(entryDetails);
 if(descendentList)
 CleanupStack::Pop(descendentList);
 }
 // Update entry in SearchSort delta cache.
 		// If entry is not present in cache,
 		// it should be handled carefully.
 		if(aIsDanglingEntry)
 			{
 			// Release CMsvCacheEntry to freepool.
-			iFreePoolInstance->ReleaseEntry(serverEntry, ETrue);
+			iFreePoolInstance->ReleaseEntryL(serverEntry, ETrue);
 			}
 		return KErrNone;
 		}
 	else
 		{
 	TRAPD(err, iDbAdapter->DeleteEntryL(aId));
 	// If the entry does not exists in cache,
 	// we need to release the entry explicitly.
 	if(releaseEntry)
 		{
-		iFreePoolInstance->ReleaseEntry(entry, ETrue);
+		iFreePoolInstance->ReleaseEntryL(entry, ETrue);
 		User::LeaveIfError(err);
 		}
 	else
 		{
 		User::LeaveIfError(err);
 			entry->Entry().SetOwner(EFalse);
 			}
 		);
 	if(releaseEntry)
 		{
-		iFreePoolInstance->ReleaseEntry(entry, ETrue);
+		iFreePoolInstance->ReleaseEntryL(entry, ETrue);
 		}
 	User::LeaveIfError(err);
 	CleanupStack::PopAndDestroy(); //children
 	}
 CMsvCacheEntry* entry = NULL;
 TBool releaseEntry = FindEntryL(aSelection.At(0), entry, EFalse);
 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.
 TBool updateTheParent = ETrue;
 TRAPD(err, releaseEntry = FindEntryL(parentId, entry, EFalse)); // can't let it leave - need to delete the child in any case.
 if(err == KErrNotFound)
 {
 updateTheParent = EFalse;
 if(releaseEntry)
 {
-iFreePoolInstance->ReleaseEntry(entry, ETrue);
+iFreePoolInstance->ReleaseEntryL(entry, ETrue);
 }
 }
 else
 {
 // Get parent's children.

branch	RCL_3
changeset 22	d2c4c66342f3
parent 12	8147bfb6c710
child 23	d51193d814ea